rpms/Coin2/F-7 .cvsignore, 1.10, 1.11 Coin2.spec, 1.35, 1.36 sources, 1.10, 1.11

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/pkgs/rpms/Coin2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10591

Modified Files:
	.cvsignore Coin2.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Coin2/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	15 Apr 2007 06:38:24 -0000	1.10
+++ .cvsignore	3 Oct 2007 05:14:19 -0000	1.11
@@ -1 +1 @@
-Coin-2.4.6.tar.gz
+Coin-2.5.0.tar.gz


Index: Coin2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Coin2/F-7/Coin2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Coin2.spec	15 Apr 2007 06:38:24 -0000	1.35
+++ Coin2.spec	3 Oct 2007 05:14:19 -0000	1.36
@@ -12,10 +12,10 @@
 
 Summary: High-level 3D visualization library
 Name: Coin2
-Version: 2.4.6
-Release: 1%{?dist}
+Version: 2.5.0
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.coin3d.org
 
@@ -51,6 +51,7 @@
 Requires: fontconfig-devel
 Requires: freetype-devel
 Requires: libGLU-devel
+Requires: pkgconfig
 
 %description devel
 Development package for Coin
@@ -62,27 +63,26 @@
 %patch5 -p1
 
 # bogus permissions
-%if "%{version}" == "2.4.6"
-chmod -x src/misc/CoinStaticObjectInDLL.{h,cpp}
-%endif
+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 \
@@ -130,12 +130,24 @@
 %{_libdir}/libCoin.so
 %{_datadir}/aclocal/coin.m4
 %dir %{_datadir}/Coin
-%{_libdir}/Coin2
 %{_datadir}/Coin/draggerDefaults
+%{_datadir}/Coin/shaders
+%{_libdir}/Coin2
 %{_mandir}/man?/*
 %doc %{coin_htmldir}
+%{_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.
+
+* Fri Aug 17 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.4.6-2
+- Update license tag.
+
 * Sat Apr 15 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.4.6-1
 - Upstream update.
 - Re-base the patches to 2.4.6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Coin2/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	15 Apr 2007 06:38:24 -0000	1.10
+++ sources	3 Oct 2007 05:14:19 -0000	1.11
@@ -1 +1 @@
-30efbdb9c761dd9fea7a7f4a0f01a50d  Coin-2.4.6.tar.gz
+1e7cb6afa69f6eed034a64021f7d1bfc  Coin-2.5.0.tar.gz