rpms/djvulibre/devel .cvsignore, 1.12, 1.13 djvulibre.spec, 1.30, 1.31 import.log, 1.1, 1.2 sources, 1.12, 1.13 djvulibre-3.5.18-plugin-manpage.patch, 1.1, NONE djvulibre-3.5.19-ja-encoding.patch, 1.1, NONE djvulibre-configure.patch, 1.1, NONE

[Rakesh Pandit]

Author: rakesh

Update of /cvs/pkgs/rpms/djvulibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18765/devel

Modified Files:
	.cvsignore djvulibre.spec import.log sources 
Removed Files:
	djvulibre-3.5.18-plugin-manpage.patch 
	djvulibre-3.5.19-ja-encoding.patch djvulibre-configure.patch 
Log Message:
Updated to 3.5.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	17 Jan 2009 03:52:28 -0000	1.12
+++ .cvsignore	3 Dec 2009 08:15:58 -0000	1.13
@@ -1 +1 @@
-djvulibre-3.5.21.tar.gz
+djvulibre-3.5.22.tar.gz


Index: djvulibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/djvulibre.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- djvulibre.spec	24 Jul 2009 20:22:10 -0000	1.30
+++ djvulibre.spec	3 Dec 2009 08:15:58 -0000	1.31
@@ -1,21 +1,18 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
-Version: 3.5.21
-Release: 3%{?dist}
+Version: 3.5.22
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://djvu.sourceforge.net/
 Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz
-Patch0: djvulibre-3.5.18-plugin-manpage.patch
-Patch1: djvulibre-3.5.19-ja-encoding.patch
-Patch2: djvulibre-configure.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): xdg-utils, /sbin/ldconfig
 Requires(preun): xdg-utils
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 BuildRequires: qt3-devel
-BuildRequires: xdg-utils
+BuildRequires: xdg-utils, chrpath
 
 %description
 DjVu is a web-centric format and software platform for distributing documents
@@ -62,18 +59,16 @@ Development files for DjVuLibre.
 
 %prep
 %setup -q
-%patch0 -p1 -b .plugin-manpage
-%patch1 -p1 -b .ja-encoding
-%patch2 -p1 -b .configure
+
 # Convert ISO8859-1 ja man pages to UTF-8 (still as of 3.5.20-2)
-for manpage in i18n/ja/*.1*; do
-    iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
-    mv tmp ${manpage}
-done
+#for manpage in i18n/ja/*.1*; do
+#    iconv -f iso8859-1 -t utf-8 -o tmp ${manpage}
+#    mv tmp ${manpage}
+#done
 
 
 %build
-%configure
+%configure --with-qt=%{_libdir}/qt-3.3 --enable-threads
 # Disable rpath on 64bit - NOT! It makes the build fail (still as of 3.5.20-2)
 #sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 #sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -92,6 +87,26 @@ done
 # Fix for the libs to get stripped correctly (still required in 3.5.20-2)
 find %{buildroot}%{_libdir} -name '*.so*' | xargs %{__chmod} +x
 
+# Remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutoxml
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvused
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cjb2
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/csepdjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuserve
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvm
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuxmlparser
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutxt
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/ddjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvumake
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cpaldjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuextract
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/c44
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvups
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djview3
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvudump
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvmcvt
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/bzz
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -144,6 +159,9 @@ fi
 
 
 %changelog
+* Mon Nov 30 2009 Ralesh Pandit  <rakesh at fedoraproject.org> 3.5.22-1
+- Updated to 3.5.22 (#542221) (Spec patch by Michal Schmidt)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Jan 2009 03:52:28 -0000	1.1
+++ import.log	3 Dec 2009 08:15:58 -0000	1.2
@@ -1 +1,2 @@
 djvulibre-3_5_21-1_fc10:HEAD:djvulibre-3.5.21-1.fc10.src.rpm:1232121100
+djvulibre-3_5_22-1_fc13:HEAD:djvulibre-3.5.22-1.fc13.src.rpm:1259828911


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/djvulibre/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	17 Jan 2009 03:52:28 -0000	1.12
+++ sources	3 Dec 2009 08:15:58 -0000	1.13
@@ -1 +1 @@
-4c6f3eb03ffbd067b6d2fe2344b0d9ad  djvulibre-3.5.21.tar.gz
+d1513784ce0e4f37d71595dc34c95ec7  djvulibre-3.5.22.tar.gz


--- djvulibre-3.5.18-plugin-manpage.patch DELETED ---


--- djvulibre-3.5.19-ja-encoding.patch DELETED ---


--- djvulibre-configure.patch DELETED ---