rpms/djvulibre/devel .cvsignore, 1.6, 1.7 djvulibre.spec, 1.14, 1.15 sources, 1.6, 1.7 djvulibre-3.5.15-gcc401.patch, 1.1, NONE djvulibre-3.5.16-extraqualif.patch, 1.1, NONE

Matthias Saou (thias) fedora-extras-commits at redhat.com
Wed Mar 15 12:20:02 UTC 2006


Author: thias

Update of /cvs/extras/rpms/djvulibre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574

Modified Files:
	.cvsignore djvulibre.spec sources 
Removed Files:
	djvulibre-3.5.15-gcc401.patch 
	djvulibre-3.5.16-extraqualif.patch 
Log Message:
Update to CVS to fix gcc 4.1 build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Mar 2006 15:51:09 -0000	1.6
+++ .cvsignore	15 Mar 2006 12:20:02 -0000	1.7
@@ -1 +1 @@
-djvulibre-3.5.16.tar.gz
+djvulibre-3.5.16cvs.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- djvulibre.spec	6 Mar 2006 16:34:50 -0000	1.14
+++ djvulibre.spec	15 Mar 2006 12:20:02 -0000	1.15
@@ -1,12 +1,11 @@
 Summary: DjVu viewers, encoders and utilities
 Name: djvulibre
 Version: 3.5.16
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Publishing
 URL: http://djvulibre.djvuzone.org/
-Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
-Patch0: djvulibre-3.5.16-extraqualif.patch
+Source: http://dl.sf.net/djvu/djvulibre-%{version}cvs.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: qt-devel, libjpeg-devel, libtiff-devel
 BuildRequires: mozilla, redhat-menus, hicolor-icon-theme
@@ -38,7 +37,9 @@
 
 %prep
 %setup
-%patch0 -p1 -b .extraqualif
+# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing
+. /etc/profile.d/qt.sh
+%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep
 
 
 %build
@@ -97,13 +98,19 @@
 #files devel
 #defattr(-, root, root, 0755)
 %{_includedir}/libdjvu/
+%{_libdir}/pkgconfig/ddjvuapi.pc
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 3.5.16-3
+- Update to CVS snapshot, fixes the build with gcc 4.1 (sf.net #1420522).
+- Include workaround for wrong qt3 includes in gui/djview/Makefile.dep.
+- Add new pkgconfig ddjvuapi.pc file.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 3.5.16-2
-- FC5 rebuild.
+- FC5 rebuild... nope.
 
 * Mon Jan 30 2006 Matthias Saou <http://freshrpms.net/> 3.5.16-1
 - Update to 3.5.16.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Mar 2006 15:51:09 -0000	1.6
+++ sources	15 Mar 2006 12:20:02 -0000	1.7
@@ -1 +1 @@
-5591c99a50aed1613a796a5aa4978fc0  djvulibre-3.5.16.tar.gz
+45e3436ca4a0f2d791909464da03bf62  djvulibre-3.5.16cvs.tar.gz


--- djvulibre-3.5.15-gcc401.patch DELETED ---


--- djvulibre-3.5.16-extraqualif.patch DELETED ---




More information about the fedora-extras-commits mailing list