rpms/SIMVoleon/F-10 SIMVoleon-2.0.1-bash4.0.diff, NONE, 1.1 SIMVoleon-2.0.1-pivy-hacks.diff, NONE, 1.1 SIMVoleon.spec, 1.11, 1.12

[corsepiu]

Author: corsepiu

Update of /cvs/pkgs/rpms/SIMVoleon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31374

Modified Files:
	SIMVoleon.spec 
Added Files:
	SIMVoleon-2.0.1-bash4.0.diff SIMVoleon-2.0.1-pivy-hacks.diff 
Log Message:
* Tue Jul 28 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.0.1-10
- Add SIMVoleon-2.0.1-pivy-hacks.diff, SIMVoleon-2.0.1-bash4.0.diff.


SIMVoleon-2.0.1-bash4.0.diff:
 simvoleon-config.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE SIMVoleon-2.0.1-bash4.0.diff ---
diff -Naur SIMVoleon-2.0.1.orig/bin/simvoleon-config.in SIMVoleon-2.0.1/bin/simvoleon-config.in
--- SIMVoleon-2.0.1.orig/bin/simvoleon-config.in	2009-07-28 03:40:32.000000000 +0200
+++ SIMVoleon-2.0.1/bin/simvoleon-config.in	2009-07-28 03:40:11.000000000 +0200
@@ -106,7 +106,7 @@
     s/ /-I/
     p
   }'
-  EOF`
+EOF`
   result=
   for inc_path in $cppflags; do
     additem=true

SIMVoleon-2.0.1-pivy-hacks.diff:
 bin/simvoleon-config.in |    4 ++++
 simvoleon.cfg.in        |    2 ++
 2 files changed, 6 insertions(+)

--- NEW FILE SIMVoleon-2.0.1-pivy-hacks.diff ---
diff -Naur SIMVoleon-2.0.1.orig/bin/simvoleon-config.in SIMVoleon-2.0.1/bin/simvoleon-config.in
--- SIMVoleon-2.0.1.orig/bin/simvoleon-config.in	2003-06-30 14:51:32.000000000 +0200
+++ SIMVoleon-2.0.1/bin/simvoleon-config.in	2009-07-28 03:39:07.000000000 +0200
@@ -50,6 +50,8 @@
   --cxxflags
   --ldflags
   --libs
+  --includedir
+  --datadir
   --msvcrt
   --ac-subst <string> | <sourcefile.in>
   --ac-desubst <sourcefile>
@@ -130,6 +132,8 @@
   --cxxflags)        echo "$cxxflags"      ;;
   --ldflags)         echo "$ldflags"       ;;
   --libs)            echo "$libs"          ;;
+  --includedir)      echo "$includedir"    ;;
+  --datadir)         echo "$datadir"       ;;
   --msvcrt)          echo "$msvcrt"        ;;
   --ac-subst)
     shift
diff -Naur SIMVoleon-2.0.1.orig/simvoleon.cfg.in SIMVoleon-2.0.1/simvoleon.cfg.in
--- SIMVoleon-2.0.1.orig/simvoleon.cfg.in	2003-06-27 15:44:50.000000000 +0200
+++ SIMVoleon-2.0.1/simvoleon.cfg.in	2009-07-28 03:35:38.000000000 +0200
@@ -9,5 +9,7 @@
 ldflags="@SIMVOLEON_EXTRA_LDFLAGS@"
 libs="@SIMVOLEON_EXTRA_LIBS@"
 msvcrt="@SIMVOLEON_MSVC_LIBC@"
+datadir="@datadir@"
+includedir="@includedir@"
 compiler="@COMPILER@"
 compiler_is_gcc=@ac_compiler_gnu@


Index: SIMVoleon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SIMVoleon/F-10/SIMVoleon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- SIMVoleon.spec	10 Feb 2008 07:17:42 -0000	1.11
+++ SIMVoleon.spec	28 Jul 2009 01:57:06 -0000	1.12
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005, 2006, 2007, 2008 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Summary: Volume rendering library for Coin
 Name: SIMVoleon
 Version: %{rpmvers}
-Release: 7%{?dist}
+Release: 10%{?dist}
 
 License: GPLv2
 Group: System Environment/Libraries
@@ -28,6 +28,11 @@ Patch1: SIMVoleon-2.0.1-simacros.diff.bz
 Patch2: SIMVoleon-2.0.1-libtool.diff.bz2
 Patch3: SIMVoleon-2.0.1-gcc4.1.diff
 
+# From upstream
+Patch4: SIMVoleon-2.0.1-pivy-hacks.diff
+# bash-4 compatibility bugfix
+Patch5: SIMVoleon-2.0.1-bash4.0.diff
+
 BuildRequires: Coin2-devel
 BuildRequires: doxygen
 BuildRoot: %{_tmppath}/%{name}-%{rpmvers}-%{release}-root-%(%{__id_u} -n)
@@ -55,6 +60,8 @@ Development files for SIMVoleon.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 chmod +x cfg/doxy4win.pl
 
@@ -105,6 +112,9 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/Coin/con
 %doc %{coin_htmldir}/*
 
 %changelog
+* Tue Jul 28 2009 Ralf Corsépius <corsepiu at fedoraproject.org> - 2.0.1-10
+- Add SIMVoleon-2.0.1-pivy-hacks.diff, SIMVoleon-2.0.1-bash4.0.diff.
+
 * Sun Feb 10 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.0.1-8
 - Rebuild for gcc43.
 - Spec-file cosmetics.