Author: arvenil Date: Sun Oct 14 17:09:59 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added TODO
- BR: OpenGL-GLU-devel
- BR: qt-designer-libs (see TODO)
- added support for libkipi
- disable support for libkexif (see TODO)
- no more ksquirrel-small (removed subpackages)
- removed empty %doc TODO
- clean
- build but doesnt work for me (see TODO)
---- Files affected:
SPECS:
ksquirrel.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: SPECS/ksquirrel.spec
diff -u SPECS/ksquirrel.spec:1.26 SPECS/ksquirrel.spec:1.27
--- SPECS/ksquirrel.spec:1.26 Thu Oct 4 17:10:25 2007
+++ SPECS/ksquirrel.spec Sun Oct 14 19:09:54 2007
@@ -1,4 +1,12 @@
# $Revision$, $Date$
+# TODO:
+# - add libkexif support, with it i get:
+# /usr/bin/ld: ksquirrel: hidden symbol `__dso_handle' in
+# /usr/lib64/gcc/x86_64-pld-linux/4.2.1/crtbegin.o is referenced by DSO
+# /usr/bin/ld: final link failed: Nonrepresentable section on output
+# - check if BR: qt-designer-libs is really needed, without it i get:
+# /usr/bin/ld: cannot find -lqui
+# - doesn't work for me, runs but i cant view any image
Summary: Graphics file browser utility
Summary(pl.UTF-8): Narzędzie do przeglądania plików graficznych
Name: ksquirrel
@@ -10,14 +18,19 @@
# Source0-md5: 73f15672456e85c05c4f49baa396cbd7
Patch0: %{name}-desktop.patch
URL: http://ksquirrel.sourceforge.net/
+BuildRequires: OpenGL-GLU-devel
BuildRequires: OpenGL-devel
BuildRequires: automake
BuildRequires: kdebase-devel >= 3.2
BuildRequires: ksquirrel-libs-devel >= %{version}
+#BuildRequires: libkexif-devel
+BuildRequires: libkipi-devel
BuildRequires: pkgconfig
+BuildRequires: qt-designer-libs
BuildRequires: rpmbuild(macros) >= 1.197
BuildRequires: sed >= 4.0
-Requires: %{name}-common = %{version}-%{release}
+Obsoletes: ksquirrel-common
+Obsoletes: ksquirrel-small
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -30,45 +43,14 @@
drzewku plików, miniaturkach, rozszerzonych miniaturkach i narzędziach
do zmiany wielkości, rozszerzenia, koloru i do drukowania obrazków.
-%package common
-Summary: Common files for KSquirrel
-Summary(pl.UTF-8): Pliki wspólne dla KSquirrel
-Group: X11/Applications/Graphics
-
-%description common
-Documentation and common files for ksquirrel and ksquirrel-small.
-
-%description common -l pl.UTF-8
-Dokumentacja oraz pliki wspólne dla ksquirrel i ksquirrel-small.
-
-%package small
-Summary: Graphics file browser utility - small version
-Summary(pl.UTF-8): Narzędzie do przeglądania plików graficznych - mała
wersja
-Group: X11/Applications/Graphics
-Requires: %{name}-common = %{version}-%{release}
-
-%description small
-KSquirrel is an image viewer for KDE with disk navigator, file tree,
-thumbnails, extended thumbnails, dynamic format support and tools to
-resize, convert, colorize and print images - small version.
-
-%description small -l pl.UTF-8
-KSquirrel to przeglądarka obrazków dla KDE z nawigacją po dyskach,
-drzewku plików, miniaturkach, rozszerzonych miniaturkach i narzędziach
-do zmiany wielkości, rozszerzenia, koloru i do drukowania obrazków -
-mała wersja.
-
%prep
%setup -q
-#%patch0 -p1
-%{__sed} -i 's@/usr/[EMAIL PROTECTED]@g' ksquirrel/*.{cpp,ui*}
%build
install /usr/share/automake/config.* admin
%configure \
-%if "%{_lib}" == "lib64"
- --enable-libsuffix=64 \
-%endif
+ --libdir=%{_libdir} \
+ --disable-kexif \
--with-qt-libraries=%{_libdir}
%{__make}
@@ -77,31 +59,28 @@
install -d $RPM_BUILD_ROOT%{_desktopdir}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT \
+ kde_htmldir=%{_kdedocdir}
+
+# move .desktop to proper place
+mv -f
$RPM_BUILD_ROOT{%{_datadir}/applnk/Graphics/%{name}.desktop,%{_desktopdir}}
-mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/ksquirrel{,-small}.desktop \
- $RPM_BUILD_ROOT%{_desktopdir}
+%find_lang %{name} --with-kde
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog README
%attr(755,root,root) %{_bindir}/ksquirrel
-%{_desktopdir}/ksquirrel.desktop
-%{_mandir}/man1/ksquirrel.*
-
-%files common
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
+%{_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
%{_datadir}/apps/ksquirrel
+%{_datadir}/config/magic/*.magic
+%{_datadir}/mimelnk/image/*.desktop
%{_iconsdir}/hicolor/*/*/*
-
-%files small
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ksquirrel-small
-%{_desktopdir}/ksquirrel-small.desktop
-%{_mandir}/man1/ksquirrel-small.*
+%{_desktopdir}/ksquirrel.desktop
+%{_mandir}/man1/ksquirrel.*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -109,6 +88,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2007/10/14 17:09:54 arvenil
+- added TODO
+- BR: OpenGL-GLU-devel
+- BR: qt-designer-libs (see TODO)
+- added support for libkipi
+- disable support for libkexif (see TODO)
+- no more ksquirrel-small (removed subpackages)
+- removed empty %doc TODO
+- clean
+- build but doesnt work for me (see TODO)
+
Revision 1.26 2007/10/04 15:10:25 shadzik
- 0.7.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ksquirrel.spec?r1=1.26&r2=1.27&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
