rpms/ode/devel .cvsignore, 1.2, 1.3 ode-0.6-configure.patch, 1.1, 1.2 ode-0.6-lib64.patch, 1.1, 1.2 ode.spec, 1.3, 1.4 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Sep 22 12:33:04 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10785
Modified Files:
.cvsignore ode-0.6-configure.patch ode-0.6-lib64.patch
ode.spec sources
Log Message:
* Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7-1
- New upstream release 0.7
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Jul 2006 20:42:01 -0000 1.2
+++ .cvsignore 22 Sep 2006 12:33:04 -0000 1.3
@@ -1 +1 @@
-ode-src-0.6.zip
+ode-src-0.7.zip
ode-0.6-configure.patch:
Index: ode-0.6-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode-0.6-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ode-0.6-configure.patch 5 Jul 2006 20:42:01 -0000 1.1
+++ ode-0.6-configure.patch 22 Sep 2006 12:33:04 -0000 1.2
@@ -1,218 +1,22 @@
---- ode-0.6/configure.configure 2006-06-09 16:54:52.000000000 +0200
-+++ ode-0.6/configure 2006-07-01 15:42:13.000000000 +0200
-@@ -3532,7 +3532,7 @@
- /usr/openwin/share/include'
+--- ode-0.7/configure~ 2006-09-22 12:15:42.000000000 +0200
++++ ode-0.7/configure 2006-09-22 12:15:42.000000000 +0200
+@@ -7117,7 +7117,7 @@
+ echo "${ECHO_T}$dEpsilon" >&6
- if test "$ac_x_includes" = no; then
-- # Guess where to find include files, by looking for Intrinsic.h.
-+ # Guess where to find include files, by looking for Xlib.h.
- # First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3540,7 +3540,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -3567,7 +3567,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- for ac_dir in $ac_x_header_dirs; do
-- if test -r "$ac_dir/X11/Intrinsic.h"; then
-+ if test -r "$ac_dir/X11/Xlib.h"; then
- ac_x_includes=$ac_dir
- break
- fi
-@@ -3581,18 +3581,18 @@
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
-- LIBS="-lXt $LIBS"
-+ LIBS="-lX11 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- int
- main ()
- {
--XtMalloc (0)
-+XrmInitialize ()
- ;
- return 0;
- }
-@@ -6309,11 +6309,6 @@
-
- case "$arch" in
- pentium3 | pentium4 | athlon* )
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SSE
--_ACEOF
--
- ;;
- esac
-
-@@ -7121,7 +7116,7 @@
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--if test "x$pentium" == xyes
-+if test "x$pentium" == xgarbage
- then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7181,7 +7176,7 @@
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--if test "x$cpu64" == xyes
-+if test "x$cpu64" == xgarbage
+-if test "$build_os" == "$target_os"
++if test "$target_cpu" != "i386"
then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -7193,7 +7188,7 @@
- echo "${ECHO_T}$cpu64" >&6
-
-
--if test x$cpu64 = xyes; then
-+if test x$cpu64 = xgarbage; then
- X86_64_SYSTEM_TRUE=
- X86_64_SYSTEM_FALSE='#'
- else
-@@ -7202,6 +7197,7 @@
- fi
+ echo "$as_me:$LINENO: checking for a Pentium CPU" >&5
+ echo $ECHO_N "checking for a Pentium CPU... $ECHO_C" >&6
+--- ode-0.7/configure.in~ 2006-09-22 12:15:58.000000000 +0200
++++ ode-0.7/configure.in 2006-09-22 12:15:58.000000000 +0200
+@@ -220,7 +220,7 @@
-+if false; then
- echo "$as_me:$LINENO: checking if building a release library" >&5
- echo $ECHO_N "checking if building a release library... $ECHO_C" >&6
- # Check whether --enable-release or --disable-release was given.
-@@ -7228,6 +7224,7 @@
- fi
- echo "$as_me:$LINENO: result: $release" >&5
- echo "${ECHO_T}$release" >&6
-+fi
-
- echo "$as_me:$LINENO: checking for char" >&5
- echo $ECHO_N "checking for char... $ECHO_C" >&6
-@@ -9317,9 +9314,9 @@
- ;;
- *)
- drawstuff="X11" # if anything else default to X11
-- so_ext=".so"
-+ so_ext=".so.0"
- DLLDEFINE=""
-- SHARED_LDFLAGS="-shared"
-+ SHARED_LDFLAGS="-shared -Wl,-soname,\\\$@"
- ;;
- esac
-
-@@ -12081,10 +12078,9 @@
- # 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-- # will be set to the directory where LIBOBJS objects are built.
-- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+ # 2. Add them.
-+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -13502,8 +13498,5 @@
- echo " Use double precision: $precision"
- echo " Use OPCODE: $opcode"
- echo " Use gyroscopic term: $gyroscopic"
--echo " Is this a Pentium: $pentium"
--echo " Is the CPU x86-64: $cpu64"
--echo " Is this a release build: $release"
- echo " Headers will be installed in $prefix/include/ode"
- echo " Libraries will be installed in $prefix/lib"
---- ode-0.6/configure.in.configure 2006-05-23 19:43:32.000000000 +0200
-+++ ode-0.6/configure.in 2006-07-01 15:42:08.000000000 +0200
-@@ -49,7 +49,9 @@
- dnl so allow users to compile programs for their target machine.
- case "$arch" in
- pentium3 | pentium4 | athlon* )
-- AC_DEFINE(HAVE_SSE,,[Use SSE Optimizations])
-+dnl This isn't used anywhere in the source, still commented out for safety. The
-+dnl x86_64 buildsys will have SSE, but the host on which the result runs not!
-+dnl AC_DEFINE(HAVE_SSE,,[Use SSE Optimizations])
- ;;
- dnl this space available for other architectures specific extensions and/or
- dnl other Intel based extensions such as 3DNow, SSE2, MMX, etc.
-@@ -205,7 +207,9 @@
- return 0;
- };
- ],pentium=yes,pentium=no,)
--if test "x$pentium" == xyes
-+dnl Check modified to always fail. The buildsys may be a pentium (and thus have
-+dnl an RDTSC), but the host on which the result runs may not!
-+if test "x$pentium" == xgarbage
+ dnl Check for PENTIUM
+-if test "$build_os" == "$target_os"
++if test "$target_cpu" != "i386"
then
- AC_DEFINE(PENTIUM,1,[is this a pentium on a gcc-based platform?])
- fi
-@@ -224,13 +228,18 @@
- return 0;
- };
- ],cpu64=yes,cpu64=no,)
--if test "x$cpu64" == xyes
-+dnl Checks modified to always fail. The FE buildsys is a x86_64, but the host
-+dnl on which the result runs could also be an i386!
-+if test "x$cpu64" == xgarbage
- then
- AC_DEFINE(X86_64_SYSTEM,1,[is this a X86_64 system on a gcc-based platform?])
- fi
- AC_MSG_RESULT($cpu64)
--AM_CONDITIONAL(X86_64_SYSTEM, test x$cpu64 = xyes)
-+AM_CONDITIONAL(X86_64_SYSTEM, test x$cpu64 = xgarbage)
-
-+dnl completely disable this, because we don't want configure to override our
-+dnl default rpmbuild CFLAGS!
-+if false; then
- AC_MSG_CHECKING(if building a release library)
- AC_ARG_ENABLE(release,AC_HELP_STRING([--enable-release],
- [build a release library with -fomit-frame-pointer and -ffast-math]),
-@@ -247,6 +256,7 @@
- CXXFLAGS="-g"
- fi
- AC_MSG_RESULT($release)
-+fi
-
- dnl Check variable type sizes
- AC_CHECK_SIZEOF(char)
-@@ -275,9 +285,9 @@
- ;;
- *)
- drawstuff="X11" # if anything else default to X11
-- so_ext=".so"
-+ so_ext=".so.0"
- DLLDEFINE=""
-- SHARED_LDFLAGS="-shared"
-+ SHARED_LDFLAGS="-shared -Wl,-soname,\\\$@"
- ;;
- esac
- dnl Set Conditionals
-@@ -474,8 +484,8 @@
- echo " Use double precision: $precision"
- echo " Use OPCODE: $opcode"
- echo " Use gyroscopic term: $gyroscopic"
--echo " Is this a Pentium: $pentium"
--echo " Is the CPU x86-64: $cpu64"
--echo " Is this a release build: $release"
-+dnl echo " Is this a Pentium: $pentium"
-+dnl echo " Is the CPU x86-64: $cpu64"
-+dnl echo " Is this a release build: $release"
- echo " Headers will be installed in $prefix/include/ode"
- echo " Libraries will be installed in $prefix/lib"
+ AC_MSG_CHECKING(for a Pentium CPU)
+ AC_TRY_RUN([
ode-0.6-lib64.patch:
Index: ode-0.6-lib64.patch
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode-0.6-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ode-0.6-lib64.patch 5 Jul 2006 20:42:01 -0000 1.1
+++ ode-0.6-lib64.patch 22 Sep 2006 12:33:04 -0000 1.2
@@ -34,3 +34,47 @@
EXEEXT=@so_ext@
traplib_PROGRAMS=libode
libode_SOURCES=
+--- ode-0.7/Makefile.in~ 2006-09-22 12:22:48.000000000 +0200
++++ ode-0.7/Makefile.in 2006-09-22 12:25:10.000000000 +0200
+@@ -646,13 +646,12 @@
+ rm -rf ${PACKAGE}-${VERSION}
+
+ @USE_SONAME_TRUE at install-exec-hook:
+- at USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- at USE_SONAME_TRUE@ $(prefix)/lib/libode.so
+- at USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- at USE_SONAME_TRUE@ $(prefix)/lib/@ODE_SONAME@
+- at USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- at USE_SONAME_TRUE@ $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION@
+- at USE_SONAME_TRUE@ /sbin/ldconfig
++ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/libode.so
++ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/@ODE_SONAME@
++ at USE_SONAME_TRUE@ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ at USE_SONAME_TRUE@ $(DESTDIR)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@
+ @USE_SONAME_FALSE at install-exec-hook:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- ode-0.7/Makefile.am~ 2006-09-22 12:23:53.000000000 +0200
++++ ode-0.7/Makefile.am 2006-09-22 12:23:53.000000000 +0200
+@@ -20,13 +20,12 @@
+
+ if USE_SONAME
+ install-exec-hook:
+- ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- $(prefix)/lib/libode.so
+- ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- $(prefix)/lib/@ODE_SONAME@
+- ln -s $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+- $(prefix)/lib/@ODE_SONAME at .@ODE_REVISION@
+- /sbin/ldconfig
++ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ $(DESTDIR)/$(libdir)/libode.so
++ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ $(DESTDIR)/$(libdir)/@ODE_SONAME@
++ ln -s @ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++ $(DESTDIR)/$(libdir)/@ODE_SONAME at .@ODE_REVISION@
+ else
+ install-exec-hook:
+ endif
Index: ode.spec
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/ode.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ode.spec 28 Aug 2006 11:58:56 -0000 1.3
+++ ode.spec 22 Sep 2006 12:33:04 -0000 1.4
@@ -1,6 +1,6 @@
Name: ode
-Version: 0.6
-Release: 3%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: High performance library for simulating rigid body dynamics
Group: System Environment/Libraries
License: BSD LGPL
@@ -47,7 +47,7 @@
%build
export CFLAGS="%{optflags} -ffast-math -fPIC"
export CXXFLAGS="%{optflags} -ffast-math -fPIC"
-%configure --enable-shared
+%configure --enable-shared --enable-soname
make %{?_smp_mflags}
@@ -55,7 +55,7 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libode.a
-ln -s libode.so.0 $RPM_BUILD_ROOT%{_libdir}/libode.so
+rm $RPM_BUILD_ROOT%{_libdir}/libode.so.0.6
%clean
@@ -70,7 +70,7 @@
%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt LICENSE*.TXT README.txt
-%{_libdir}/libode.so.0
+%{_libdir}/libode.so.*
%files devel
%defattr(-,root,root,-)
@@ -80,6 +80,9 @@
%changelog
+* Fri Sep 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7-1
+- New upstream release 0.7
+
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6-3
- FE6 Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Jul 2006 20:42:01 -0000 1.2
+++ sources 22 Sep 2006 12:33:04 -0000 1.3
@@ -1 +1 @@
-7afdb1d434a1e2cc2d701fdf8d1f2fad ode-src-0.6.zip
+b6727fef2cbb9ca812438bb774c9d6ec ode-src-0.7.zip
More information about the fedora-extras-commits
mailing list