rpms/ogre/devel .cvsignore, 1.3, 1.4 ogre-1.2.2-soname.patch, 1.1, 1.2 ogre.spec, 1.4, 1.5 sources, 1.3, 1.4 ogre-1.2.1-char_height.patch, 1.1, NONE ogre-1.2.1-gtkmm.patch, 1.2, NONE ogre-1.2.1-visibility.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Oct 27 15:58:35 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32685

Modified Files:
	.cvsignore ogre-1.2.2-soname.patch ogre.spec sources 
Removed Files:
	ogre-1.2.1-char_height.patch ogre-1.2.1-gtkmm.patch 
	ogre-1.2.1-visibility.patch 
Log Message:
* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
- New upstream release 1.2.3
- Warning as always with a new upstream ogre release this breaks the ABI
  and changes the soname!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Aug 2006 12:46:04 -0000	1.3
+++ .cvsignore	27 Oct 2006 15:58:04 -0000	1.4
@@ -1 +1 @@
-ogre-linux_osx-v1-2-2p1.tar.bz2
+ogre-linux_osx-v1-2-3.tar.bz2

ogre-1.2.2-soname.patch:

Index: ogre-1.2.2-soname.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.2-soname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.2.2-soname.patch	1 Aug 2006 12:50:10 -0000	1.1
+++ ogre-1.2.2-soname.patch	27 Oct 2006 15:58:04 -0000	1.2
@@ -25,8 +25,8 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE OGREMAIN_VERSION_INFO LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT SHARED_FLAGS PLUGIN_FLAGS GL!
 _LIBS RC ac_ct_RC OGRE_NT_TRUE OGRE_NT_FALSE OGRE_LINUX_TRUE OGRE_LINUX_FALSE OGRE_OSX_TRUE OGRE_OSX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OGRE_CFLAGS STLPORT_CFLAGS STLPORT_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS BUILD_UNIT_TESTS_TRUE BUILD_UNIT_TESTS_FALSE PKG_CONFIG ac_pt_PKG_CONFIG ZZIPLIB_CFLAGS ZZIPLIB_LIBS CFGTK_DEPS_CFLAGS CFGTK_DEPS_LIBS OGRE_CFGTK SDL_CONFIG SDL_CFLAGS SDL_LIBS PLATFORM_CFLAGS PLATFORM_LIBS OGRE_PLATFORM GLSUPPORT_CFLAGS GLSUPPORT_LIBS OGRE_GLSUPPORT OGRE_DOUBLE_PRECISION_FLAGS OGRE_THREAD_LIBS USE_DEVIL_TRUE USE_DEVIL_FALSE BUILD_CGPLUGIN_TRUE BUILD_CGPLUGIN_FALSE OPENEXR_CFLAGS OPENEXR_LIBS BUILD_EXRPLUGIN_TRUE BUILD_EXRPLUGIN_FALSE BUILD_DX9RENDERSYSTEM_TRUE BUILD_DX9RENDERSYSTEM_FALSE CEGUI_CFLAGS CEGUI_LIBS HAVE_CEGUI_TRUE HAVE_CEGUI_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -34,8 +34,8 @@
  CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
  LIBS="$LIBS $SDL_LIBS"
  
--OGREMAIN_CURRENT=11
--OGREMAIN_REVISION=2
+-OGREMAIN_CURRENT=12
+-OGREMAIN_REVISION=0
 -OGREMAIN_AGE=0
 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
 -
@@ -60,8 +60,8 @@
  
 -dnl versioning info for libtool
 -dnl Note this is the ABI version which is not the same as our actual library version
--OGREMAIN_CURRENT=11
--OGREMAIN_REVISION=2
+-OGREMAIN_CURRENT=12
+-OGREMAIN_REVISION=0
 -OGREMAIN_AGE=0
 -OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
 -AC_SUBST(OGREMAIN_VERSION_INFO)


Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ogre.spec	28 Aug 2006 12:04:02 -0000	1.4
+++ ogre.spec	27 Oct 2006 15:58:04 -0000	1.5
@@ -1,16 +1,13 @@
-%define version_postfix p1
-
 Name:           ogre
-Version:        1.2.2
-Release:        2.%{version_postfix}%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Object-Oriented Graphics Rendering Engine
 License:        LGPL
 Group:          System Environment/Libraries
 URL:            http://www.ogre3d.org/
-Source0:        http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -)%{version_postfix}.tar.bz2
+Source0:        http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -).tar.bz2
 Patch0:         ogre-1.2.1-rpath.patch
-Patch1:         ogre-1.2.1-gtkmm.patch
-Patch2:         ogre-1.2.2-soname.patch
+Patch1:         ogre-1.2.2-soname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cegui-devel zziplib-devel DevIL-devel SDL-devel freetype-devel
 BuildRequires:  libglademm24-devel libsigc++20-devel
@@ -48,8 +45,7 @@
 %prep
 %setup -q -n ogrenew
 %patch0 -p1 -z .rpath
-%patch1 -p1 -z .gtkmm
-%patch2 -p1 -z .soname
+%patch1 -p1 -z .soname
 # sigh stop autoxxx from rerunning because of our patches above.
 touch aclocal.m4
 touch configure
@@ -130,6 +126,11 @@
 
 
 %changelog
+* Fri Oct 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.3-1
+- New upstream release 1.2.3
+- Warning as always with a new upstream ogre release this breaks the ABI
+  and changes the soname!
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-2.p1
 - FE6 Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Aug 2006 12:31:47 -0000	1.3
+++ sources	27 Oct 2006 15:58:04 -0000	1.4
@@ -1 +1 @@
-34004bdde39427e9a3213286f8cc057a  ogre-linux_osx-v1-2-2p1.tar.bz2
+b2a8e3df61e2245c46457367a6b73ca0  ogre-linux_osx-v1-2-3.tar.bz2


--- ogre-1.2.1-char_height.patch DELETED ---


--- ogre-1.2.1-gtkmm.patch DELETED ---


--- ogre-1.2.1-visibility.patch DELETED ---




More information about the fedora-extras-commits mailing list