rpms/libgphoto2/devel libgphoto2.spec,1.12,1.13

[Jindrich Novy]

Author: jnovy

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

Modified Files:
	libgphoto2.spec 
Log Message:
* Tue Sep 23 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-2
- convert all shipped docs to UTF-8



Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgphoto2.spec	1 Aug 2008 19:07:24 -0000	1.12
+++ libgphoto2.spec	23 Sep 2008 10:49:56 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -55,6 +55,13 @@
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
 
+for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
+	mv ${i} ${i}.old
+	iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
+	touch -r ${i}.old ${i} || :
+	rm -f ${i}.old
+done
+
 # FIXME: These .pc.in files aren't actually being installed?
 cat > gphoto2.pc.in << \EOF
 prefix=@prefix@
@@ -102,13 +109,6 @@
 grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
 popd
 
-for i in AUTHORS COPYING; do
-	mv ${i} ${i}.old
-	iconv -f cp1250 -t utf-8 < ${i}.old > ${i}
-	touch -r ${i}.old ${i} || :
-	rm -f ${i}.old
-done
-
 rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -151,6 +151,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 23 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-2
+- convert all shipped docs to UTF-8
+
 * Fri Aug 01 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-1
 - update to 2.4.2
 - contains many fixes in the Canon camera communication interface