rpms/djvulibre/FC-4 .cvsignore, 1.4, 1.5 djvulibre.spec, 1.8, 1.9 sources, 1.4, 1.5

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/djvulibre/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22973/FC-4

Modified Files:
	.cvsignore djvulibre.spec sources 
Log Message:
Update to 3.5.15 which fixes some build issues on FC-4, and fix the remaining.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2004 02:45:25 -0000	1.4
+++ .cvsignore	4 Aug 2005 18:10:09 -0000	1.5
@@ -1 +1 @@
-djvulibre-3.5.14.tar.gz
+djvulibre-3.5.15.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/FC-4/djvulibre.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- djvulibre.spec	6 Apr 2005 22:11:36 -0000	1.8
+++ djvulibre.spec	4 Aug 2005 18:10:09 -0000	1.9
@@ -1,15 +1,14 @@
 Summary: DjVu viewers, encoders and utilities
 Name: djvulibre
-Version: 3.5.14
-Release: 5
-
+Version: 3.5.15
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-URL: http://djvu.sourceforge.net/
+URL: http://djvulibre.djvuzone.org/
 Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: XFree86-devel, qt-devel, libjpeg-devel
-BuildRequires: libstdc++-devel, gcc-c++, mozilla
+BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel
+BuildRequires: mozilla, redhat-menus
 # Provide these here, they're so small, it's not worth splitting them out
 Provides: mozilla-djvulibre = %{version}-%{release}
 Provides: djvulibre-devel = %{version}-%{release}
@@ -42,13 +41,19 @@
 %install
 %{__rm} -rf %{buildroot}
 %makeinstall
-%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins
-%{__ln_s} ../../netscape/plugins/nsdejavu.so \
-    %{buildroot}%{_libdir}/mozilla/plugins/
+# Move plugin from the netscape directory to the main mozilla one
+%{__mkdir_p} %{buildroot}%{_libdir}/mozilla/plugins/
+%{__mv} %{buildroot}%{_libdir}/netscape/plugins/nsdejavu.so \
+        %{buildroot}%{_libdir}/mozilla/plugins/nsdejavu.so
 
-# Fix for the libs to get stripped correctly (debuginfo)
+# Fix for the libs to get stripped correctly (still required in 3.5.15)
 find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x
 
+# Move menu entry pixmap to new location
+%{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+%{__mv} %{buildroot}%{_datadir}/pixmaps/djvu.png \
+        %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/djvu.png
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -56,35 +61,49 @@
 
 %post
 /sbin/ldconfig
+gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || :
 update-desktop-database /usr/share/applications || :
 
 %postun
 /sbin/ldconfig
+gtk-update-icon-cache -q -f %{_datadir}/icons/hicolor || :
 update-desktop-database /usr/share/applications || :
 
 
 %files
 %defattr(-, root, root, 0755)
-%doc README COPYRIGHT COPYING NEWS TODO doc
+%doc README COPYRIGHT COPYING NEWS TODO doc/
 %{_bindir}/*
-%{_includedir}/libdjvu/
-%exclude %{_libdir}/*.la
-%{_libdir}/*.so*
-%{_libdir}/*/plugins/*.so
+%{_libdir}/*.so.*
+%{_libdir}/mozilla/plugins/nsdejavu.so
 %{_datadir}/application-registry/djvu.applications
 %{_datadir}/applications/djview.desktop
+%{_datadir}/icons/hicolor/??x??/apps/djvu.png
 %{_datadir}/icons/hicolor/??x??/mimetypes/djvu.png
-%{_datadir}/mime-info/djvu.*
-%{_datadir}/mimelnk/image/x-djvu.desktop
 %{_datadir}/djvu/
-%{_datadir}/pixmaps/djvu.png
+%{_datadir}/mime-info/djvu.*
 %{_mandir}/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 
+#files devel
+#defattr(-, root, root, 0755)
+%{_includedir}/libdjvu/
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
+
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Thu Aug  4 2005 Matthias Saou <http://freshrpms.net/> 3.5.15-1
+- Update to 3.5.15.
+- Move desktop icon to datadir/icons/hicolor.
+- Add gtk-update-icon-cache calls for the new icon.
+- Move browser plugin from netscape to mozilla directory instead of symlinking.
+- Clean build requirements and add libtiff-devel.
+- Add redhat-menus build req since it owns /etc/xdg/menus/applications.menu,
+  which the configure script checks to install the desktop file.
+
+* Tue May  3 2005 David Woodhouse <dwmw2 at infradead.org> 3.5.14-6
+- Remove files that were installed only for older KDE versions.
 
 * Mon Feb 14 2005 David Woodhouse <dwmw2 at infradead.org> 3.5.14-4
 - Include %%{_datadir}/mimelnk/image/x-djvu.desktop


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2004 02:45:25 -0000	1.4
+++ sources	4 Aug 2005 18:10:09 -0000	1.5
@@ -1 +1 @@
-a9b60d0c47d6b98e321100d329c7f3b3  djvulibre-3.5.14.tar.gz
+4a4c5a36799e73bd93afc4fa5d69b315  djvulibre-3.5.15.tar.gz