SPECS: ksquirrel.spec - reenabled kexif support (requires fixed li...

[qboosh]

Author: qboosh                       Date: Sun Jan 20 10:42:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reenabled kexif support (requires fixed library), cleanup
- include COPYING in doc, contains just licensing summary (GPL text is in LICENSE file)

---- Files affected:
SPECS:
   ksquirrel.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/ksquirrel.spec
diff -u SPECS/ksquirrel.spec:1.29 SPECS/ksquirrel.spec:1.30
--- SPECS/ksquirrel.spec:1.29	Sun Nov  4 11:44:41 2007
+++ SPECS/ksquirrel.spec	Sun Jan 20 11:42:50 2008
@@ -1,18 +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
+# - recheck (was: 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
 Version:	0.7.3
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://dl.sourceforge.net/ksquirrel/%{name}-%{version}.tar.bz2
 # Source0-md5:	61b8c4f653eb2a9f8b7572f6b14771df
@@ -21,14 +15,14 @@
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
 BuildRequires:	automake
-BuildRequires:	kdebase-devel >= 3.2
+BuildRequires:	kdebase-devel >= 9:3.3
 BuildRequires:	ksquirrel-libs-devel >= %{version}
-#BuildRequires:	libkexif-devel
+BuildRequires:	libkexif-devel
 BuildRequires:	libkipi-devel
 BuildRequires:	pkgconfig
+# libqui
 BuildRequires:	qt-designer-libs
 BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	sed >= 4.0
 Obsoletes:	ksquirrel-common
 Obsoletes:	ksquirrel-small
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,20 +45,19 @@
 install /usr/share/automake/config.* admin
 %configure \
 	--libdir=%{_libdir} \
-	--disable-kexif \
 	--with-qt-libraries=%{_libdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %{__make} install \
 	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/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %find_lang %{name} --with-kde
 
@@ -73,15 +66,17 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS COPYING ChangeLog README
 %attr(755,root,root) %{_bindir}/ksquirrel
 %{_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
 %{_datadir}/apps/ksquirrel
-%{_datadir}/config/magic/*.magic
+%{_datadir}/config/magic/x-ras.magic
+%{_datadir}/config/magic/x-sun.magic
+%{_datadir}/config/magic/x-utah.magic
 %{_datadir}/mimelnk/image/*.desktop
-%{_iconsdir}/hicolor/*/*/*
-%{_desktopdir}/ksquirrel.desktop
-%{_mandir}/man1/ksquirrel.*
+%{_desktopdir}/kde/ksquirrel.desktop
+%{_iconsdir}/hicolor/*/apps/ksquirrel.png
+%{_mandir}/man1/ksquirrel.1*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,6 +84,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2008-01-20 10:42:50  qboosh
+- reenabled kexif support (requires fixed library), cleanup
+- include COPYING in doc, contains just licensing summary (GPL text is in LICENSE file)
+
 Revision 1.29  2007-11-04 10:44:41  rotom
 - up to 0.7.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ksquirrel.spec?r1=1.29&r2=1.30&f=u