From 34e94adef5432b537000c62d054cae8c9247db35 Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Tue, 8 Jun 2010 20:07:23 +0000 Subject: [PATCH 1/5] New upstream version (0.2.1) --- .cvsignore | 2 +- simspark.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1994928..27f202d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -simspark-0.2.tar.gz +simspark-0.2.1.tar.gz diff --git a/simspark.spec b/simspark.spec index e59d673..1c87ef9 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,5 +1,5 @@ Name: simspark -Version: 0.2 +Version: 0.2.1 Release: 1%{?dist} Summary: Spark physical simulation system @@ -14,11 +14,7 @@ BuildRequires: ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel BuildRequires: ImageMagick Conflicts: rcssserver3d < 0.6.1 Requires: ruby ruby(abi) = 1.8 -%if 0%{?fedora} <= 10 -Requires: dejavu-fonts -%else Requires: dejavu-sans-mono-fonts -%endif %description Spark is a physical simulation system. The primary purpose of this system is @@ -82,6 +78,10 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Wed Jun 09 2010 Hedayat Vatankhah - 0.2.1-1 +- New upstream version 0.2.1 +- Removed conditional for F10 and before + * Tue Jan 19 2010 Hedayat Vatankhah 0.2-1 - Updated to latest upstream release 0.2 diff --git a/sources b/sources index a17d1e3..1af9389 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aee345bea7cc42bad5b25e42223146a1 simspark-0.2.tar.gz +068eef4a50ba4318c1cc0169a0618047 simspark-0.2.1.tar.gz From aa3ff0cd07ae7fa038262fbf359af3393b046bbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:47:23 +0000 Subject: [PATCH 2/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b918f98..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: simspark -# $Id: Makefile,v 1.1 2009/03/22 05:39:47 kevin Exp $ -NAME := simspark -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index ab42a29..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -simspark-0_1-3_fc10:HEAD:simspark-0.1-3.fc10.src.rpm:1237704716 From 64fd0a2ae8cd94676ccb6f226843d18cff0b6fbf Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Wed, 4 Aug 2010 04:39:34 +0430 Subject: [PATCH 3/5] Rebuild for the new boost Fixed the multilib conflict in config scripts --- simspark-confscript-mlibfix.patch | 241 ++++++++++++++++++++++++++++++ simspark.spec | 8 +- 2 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 simspark-confscript-mlibfix.patch diff --git a/simspark-confscript-mlibfix.patch b/simspark-confscript-mlibfix.patch new file mode 100644 index 0000000..ae61554 --- /dev/null +++ b/simspark-confscript-mlibfix.patch @@ -0,0 +1,241 @@ +diff -up simspark-0.2.1/lib/kerosin/kerosin-config.in.mlibfix simspark-0.2.1/lib/kerosin/kerosin-config.in +--- simspark-0.2.1/lib/kerosin/kerosin-config.in.mlibfix 2010-06-08 13:09:00.000000000 +0430 ++++ simspark-0.2.1/lib/kerosin/kerosin-config.in 2010-08-04 04:29:02.566306185 +0430 +@@ -14,6 +14,7 @@ Options: + [--libs] + [--libtool] + [--cflags] ++ [-m32|-m64] + EOF + exit $1 + } +@@ -22,6 +23,16 @@ if test $# -eq 0 ; then + usage 1 1>&2 + fi + ++ARCH=`arch` ++case $ARCH in ++ x86_64 | ia64 | s390x) ++ LIBDIR="/usr/lib64" ++ ;; ++ * ) ++ LIBDIR="/usr/lib" ++ ;; ++esac ++ + while test $# -gt 0 ; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +@@ -57,6 +68,12 @@ while test $# -gt 0 ; do + --libtool) + echo_libtool=yes + ;; ++ -m32) ++ LIBDIR="/usr/lib" ++ ;; ++ -m64) ++ LIBDIR="/usr/lib64" ++ ;; + *) + usage 1 1>&2 + ;; +@@ -93,7 +110,7 @@ if test "$echo_libs" = "yes" ; then + else + libs="-lkerosin" + fi +- echo -L@libdir@/simspark $libs ++ echo -L$LIBDIR/simspark $libs + fi + + if test "$echo_libtool" = "yes" ; then +@@ -105,7 +122,7 @@ if test "$echo_libtool" = "yes" ; then + if test `uname` = "Darwin"; then + convlib="$convlib -framework OpenGL -framework IL -framework SDL " + fi +- echo @libdir@/simspark/$convlib ++ echo $LIBDIR/simspark/$convlib + fi + + # EOF +diff -up simspark-0.2.1/lib/oxygen/oxygen-config.in.mlibfix simspark-0.2.1/lib/oxygen/oxygen-config.in +--- simspark-0.2.1/lib/oxygen/oxygen-config.in.mlibfix 2010-06-08 13:08:59.000000000 +0430 ++++ simspark-0.2.1/lib/oxygen/oxygen-config.in 2010-08-04 04:29:09.525209055 +0430 +@@ -14,6 +14,7 @@ Options: + [--libs] + [--libtool] + [--cflags] ++ [-m32|-m64] + EOF + exit $1 + } +@@ -22,6 +23,16 @@ if test $# -eq 0 ; then + usage 1 1>&2 + fi + ++ARCH=`arch` ++case $ARCH in ++ x86_64 | ia64 | s390x) ++ LIBDIR="/usr/lib64" ++ ;; ++ * ) ++ LIBDIR="/usr/lib" ++ ;; ++esac ++ + while test $# -gt 0 ; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +@@ -57,6 +68,12 @@ while test $# -gt 0 ; do + --libtool) + echo_libtool=yes + ;; ++ -m32) ++ LIBDIR="/usr/lib" ++ ;; ++ -m64) ++ LIBDIR="/usr/lib64" ++ ;; + *) + usage 1 1>&2 + ;; +@@ -93,7 +110,7 @@ if test "$echo_libs" = "yes" ; then + else + libs="-loxygen" + fi +- echo -L@libdir@/simspark $libs ++ echo -L$LIBDIR/simspark $libs + fi + + if test "$echo_libtool" = "yes" ; then +@@ -102,7 +119,7 @@ if test "$echo_libtool" = "yes" ; then + else + convlib="liboxygen.la" + fi +- echo @libdir@/simspark/$convlib ++ echo $LIBDIR/simspark/$convlib + fi + + # EOF +diff -up simspark-0.2.1/lib/salt/salt-config.in.mlibfix simspark-0.2.1/lib/salt/salt-config.in +--- simspark-0.2.1/lib/salt/salt-config.in.mlibfix 2010-06-08 13:09:00.000000000 +0430 ++++ simspark-0.2.1/lib/salt/salt-config.in 2010-08-04 04:22:13.525157510 +0430 +@@ -15,6 +15,7 @@ Options: + [--libs] + [--libtool] + [--cflags] ++ [-m32|-m64] + EOF + exit $1 + } +@@ -23,6 +24,16 @@ if test $# -eq 0 ; then + usage 1 1>&2 + fi + ++ARCH=`arch` ++case $ARCH in ++ x86_64 | ia64 | s390x) ++ LIBDIR="/usr/lib64" ++ ;; ++ * ) ++ LIBDIR="/usr/lib" ++ ;; ++esac ++ + while test $# -gt 0 ; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +@@ -61,6 +72,12 @@ while test $# -gt 0 ; do + --libdir) + echo_libdir=yes + ;; ++ -m32) ++ LIBDIR="/usr/lib" ++ ;; ++ -m64) ++ LIBDIR="/usr/lib64" ++ ;; + *) + usage 1 1>&2 + ;; +@@ -97,7 +114,7 @@ if test "$echo_libs" = "yes" ; then + else + libs="-lsalt @SALT_LIBADD@" + fi +- echo -L@libdir@/simspark $libs ++ echo -L$LIBDIR/simspark $libs + fi + + if test "$echo_libtool" = "yes" ; then +@@ -106,11 +123,11 @@ if test "$echo_libtool" = "yes" ; then + else + convlib="libsalt.la" + fi +- echo @libdir@/simspark/$convlib ++ echo $LIBDIR/simspark/$convlib + fi + + if test "$echo_libdir" = "yes" ; then +- echo @libdir@/simspark ++ echo $LIBDIR/simspark + fi + + # EOF +diff -up simspark-0.2.1/lib/zeitgeist/zeitgeist-config.in.mlibfix simspark-0.2.1/lib/zeitgeist/zeitgeist-config.in +--- simspark-0.2.1/lib/zeitgeist/zeitgeist-config.in.mlibfix 2010-06-08 13:09:00.000000000 +0430 ++++ simspark-0.2.1/lib/zeitgeist/zeitgeist-config.in 2010-08-04 04:28:56.398341469 +0430 +@@ -14,6 +14,7 @@ Options: + [--libs] + [--libtool] + [--cflags] ++ [-m32|-m64] + EOF + exit $1 + } +@@ -22,6 +23,16 @@ if test $# -eq 0 ; then + usage 1 1>&2 + fi + ++ARCH=`arch` ++case $ARCH in ++ x86_64 | ia64 | s390x) ++ LIBDIR="/usr/lib64" ++ ;; ++ * ) ++ LIBDIR="/usr/lib" ++ ;; ++esac ++ + while test $# -gt 0 ; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +@@ -57,6 +68,12 @@ while test $# -gt 0 ; do + --libtool) + echo_libtool=yes + ;; ++ -m32) ++ LIBDIR="/usr/lib" ++ ;; ++ -m64) ++ LIBDIR="/usr/lib64" ++ ;; + *) + usage 1 1>&2 + ;; +@@ -93,7 +110,7 @@ if test "$echo_libs" = "yes" ; then + else + libs="-lzeitgeist" + fi +- echo -L@libdir@/simspark $libs ++ echo -L$LIBDIR/simspark $libs + fi + + if test "$echo_libtool" = "yes" ; then +@@ -105,7 +122,7 @@ if test "$echo_libtool" = "yes" ; then + if test `uname -s` = "Darwin"; then + convlib="$convlib -framework Carbon" + fi +- echo @libdir@/simspark/$convlib ++ echo $LIBDIR/simspark/$convlib + fi + + # EOF diff --git a/simspark.spec b/simspark.spec index 1c87ef9..fb3c9c1 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,12 +1,13 @@ Name: simspark Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Spark physical simulation system Group: Development/Libraries License: GPLv2 URL: http://simspark.sourceforge.net Source0: http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz +Patch0: %{name}-confscript-mlibfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex) @@ -34,6 +35,7 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .mlibfix %build mkdir build @@ -78,6 +80,10 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Wed Aug 04 2010 Hedayat Vatankhah - 0.2.1-2 +- Rebuild for the new boost +- Fixed multilib conflict in config scripts (rh #507983) + * Wed Jun 09 2010 Hedayat Vatankhah - 0.2.1-1 - New upstream version 0.2.1 - Removed conditional for F10 and before From 320694b15bf222dc4152d84a92b81038a2714f38 Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Mon, 8 Nov 2010 19:59:38 +0330 Subject: [PATCH 4/5] - Rebuilt to fix crashing in multi-threaded mode - Replacing an old address in changelog comments --- simspark.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/simspark.spec b/simspark.spec index fb3c9c1..95fb68e 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark Version: 0.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -80,11 +80,15 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog -* Wed Aug 04 2010 Hedayat Vatankhah - 0.2.1-2 +* Mon Nov 08 2010 Hedayat Vatankhah - 0.2.1-3 +- Rebuilt to fix crashing in multi-threaded mode +- Replacing an old address in changelog comments + +* Wed Aug 04 2010 Hedayat Vatankhah - 0.2.1-2 - Rebuild for the new boost - Fixed multilib conflict in config scripts (rh #507983) -* Wed Jun 09 2010 Hedayat Vatankhah - 0.2.1-1 +* Wed Jun 09 2010 Hedayat Vatankhah - 0.2.1-1 - New upstream version 0.2.1 - Removed conditional for F10 and before From 88c7d7ec4b3be698f6aa5a57354f2eeb94b85c67 Mon Sep 17 00:00:00 2001 From: Hedayat Vatankhah Date: Wed, 27 Apr 2011 12:17:32 +0430 Subject: [PATCH 5/5] Updated to upstream 0.2.2 release --- .gitignore | 1 + simspark.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 27f202d..78a81d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ simspark-0.2.1.tar.gz +/simspark-0.2.2.tar.gz diff --git a/simspark.spec b/simspark.spec index 95fb68e..e33099a 100644 --- a/simspark.spec +++ b/simspark.spec @@ -1,6 +1,6 @@ Name: simspark -Version: 0.2.1 -Release: 3%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Spark physical simulation system Group: Development/Libraries @@ -42,7 +42,7 @@ mkdir build cd build export CXXFLAGS="${CXXFLAGS:-%optflags}" export CFLAGS="${CFLAGS:-%optflags}" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} .. +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR:PATH=%{_lib} -DODE_CONFIG_EXEC=ode-double-config .. make VERBOSE=1 %{?_smp_mflags} make pdf cp doc/devel/manual.pdf ../doc/devel/ @@ -80,6 +80,9 @@ rm -rf %{buildroot} %doc doc/devel/howtos doc/devel/manual.pdf %changelog +* Wed Apr 27 2011 Hedayat Vatankhah - 0.2.2-1 +- Updated to latest release 0.2.2 + * Mon Nov 08 2010 Hedayat Vatankhah - 0.2.1-3 - Rebuilt to fix crashing in multi-threaded mode - Replacing an old address in changelog comments diff --git a/sources b/sources index 1af9389..c7f4496 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -068eef4a50ba4318c1cc0169a0618047 simspark-0.2.1.tar.gz +b93320a0c6794766cab6bd37b6081d12 simspark-0.2.2.tar.gz