rpms/Coin2/devel Coin2.spec,1.37,1.38

Ralf Corsépius (corsepiu) fedora-extras-commits at redhat.com
Wed Oct 3 03:18:54 UTC 2007


Author: corsepiu

Update of /cvs/pkgs/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26016

Modified Files:
	Coin2.spec 
Log Message:
* Wed Oct 03 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.5.0-2
- Fix permissions on source files.
- Convert sources to utf-8.



Index: Coin2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Coin2.spec	2 Oct 2007 09:25:40 -0000	1.37
+++ Coin2.spec	3 Oct 2007 03:18:22 -0000	1.38
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group: System Environment/Libraries
@@ -63,26 +63,26 @@
 %patch5 -p1
 
 # bogus permissions
-find . \( -name '*.h' -o -name '*.cpp' -o -name '*.c' \) \
-| while read a; do test -x $a && chmod -x $a; done
+for a in $(find . \( -name '*.h' -o -name '*.cpp' -o -name '*.c' \)); do \
+  test -x $a && chmod -x $a; \
+done
+
+# convert sources to utf-8
+for a in $(find . -type f -exec file {} \; | grep -i iso | sed -e 's,:.*,,'); do \
+  /usr/bin/iconv -f ISO-8859-1 -t utf-8 $a > $a~; \
+  mv $a~ $a; \
+done
 
 sed -i -e 's, at LIBSIMAGE_SONAME@,"%{libsimage_SONAME}",' \
   src/glue/simage_wrapper.c
 sed -i -e 's, at LIBOPENAL_SONAME@,"%{libopenal_SONAME}",' \
   src/glue/openal_wrapper.c
 
-# HACK ALERT
-# The sources are ISO-8859-1 encoded
-# We want doxygen to generate utf-8 encoded docs from them
-sed -i \
- -e 's,^\(INPUT_FILTER.*=\).*$,\1 \"/usr/bin/iconv -f ISO-8859-1 -t utf-8\",' \
-  docs/coin.doxygen.in
-
 %build
 %configure \
 	--includedir=%{coin_includedir} \
 	--disable-dependency-tracking \
-        --enable-shared \
+	--enable-shared \
 	--disable-dl-libbzip2 \
 	--disable-dl-glu \
 	--disable-dl-zlib \
@@ -138,6 +138,10 @@
 %{_libdir}/pkgconfig/Coin.pc
 
 %changelog
+* Wed Oct 03 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.5.0-2
+- Fix permissions on source files.
+- Convert sources to utf-8.
+
 * Tue Oct 02 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.5.0-1
 - Upstream update.
 




More information about the fedora-extras-commits mailing list