rpms/ogre/devel ogre-1.2.1-gtkmm.patch, 1.1, 1.2 ogre.spec, 1.2, 1.3 sources, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Aug 1 12:31:47 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/ogre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv669
Modified Files:
ogre-1.2.1-gtkmm.patch ogre.spec sources
Log Message:
* Thu Jul 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1.p1
- New upstream release 1.2.2p1
- Drop integrated char_height patch
- Drop ogre-1.2.1-visibility.patch since this is fixed with the latest gcc
release, but keep it in CVS in case things break again.
- Add a patch that replaces -version-info libtool argument with -release,
which results in hardcoding the version number into the soname. This is
needed because upstream changes the ABI every release, without changing the
CURRENT argument passed to -version-info .
- Also add -release when linking libCEGUIOgreRenderer.so as that was previously
unversioned.
ogre-1.2.1-gtkmm.patch:
Index: ogre-1.2.1-gtkmm.patch
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre-1.2.1-gtkmm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogre-1.2.1-gtkmm.patch 7 Jul 2006 18:24:11 -0000 1.1
+++ ogre-1.2.1-gtkmm.patch 1 Aug 2006 12:31:47 -0000 1.2
@@ -1,15 +1,3 @@
-diff -ur ogrenew/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h ogrenew.new/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h
---- ogrenew/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h 2005-02-04 18:50:41.000000000 +0100
-+++ ogrenew.new/PlatformManagers/SDL/include/OgreSDLConfig_gtk.h 2006-06-16 22:30:36.000000000 +0200
-@@ -40,7 +40,7 @@
-
- namespace Ogre {
- /** GTK+ config */
-- class SDLConfig : public ConfigDialog, public SigC::Object
-+ class SDLConfig : public ConfigDialog, public sigc::trackable
- {
- public:
- SDLConfig()
diff -ur ogrenew/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp ogrenew.new/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp
--- ogrenew/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp 2006-01-26 13:38:24.000000000 +0100
+++ ogrenew.new/PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp 2006-06-16 22:30:00.000000000 +0200
@@ -21,27 +9,3 @@
#include <libglademm/xml.h>
-@@ -65,17 +66,16 @@
- _opt_menu = NULL;
-
- // Hookup signals
-- _winConfig->signal_delete_event().connect(SigC::slot(*this,
-- &SDLConfig::on_window_delete));
-+ _winConfig->signal_delete_event().connect(sigc::mem_fun(this, &SDLConfig::on_window_delete));
- _option_selection = _lstOptions->get_selection();
-- _option_selection->signal_changed().connect(SigC::slot(*this,
-+ _option_selection->signal_changed().connect(sigc::mem_fun(this,
- &SDLConfig::on_option_changed));
-- _optRenderer->signal_changed().connect(SigC::slot(*this,
-+ _optRenderer->signal_changed().connect(sigc::mem_fun(this,
- &SDLConfig::on_renderer_changed));
-- _optOptValues->signal_changed().connect(SigC::slot(*this,
-+ _optOptValues->signal_changed().connect(sigc::mem_fun(this,
- &SDLConfig::on_value_changed));
-- btn_ok->signal_clicked().connect(SigC::slot(*this, &SDLConfig::on_btn_ok));
-- btn_cancel->signal_clicked().connect(SigC::slot(&Gtk::Main::quit));
-+ btn_ok->signal_clicked().connect(sigc::mem_fun(this, &SDLConfig::on_btn_ok));
-+ btn_cancel->signal_clicked().connect(sigc::ptr_fun(&Gtk::Main::quit));
-
-
- // Initialize
Index: ogre.spec
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/ogre.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogre.spec 18 Jul 2006 19:01:20 -0000 1.2
+++ ogre.spec 1 Aug 2006 12:31:47 -0000 1.3
@@ -1,15 +1,16 @@
+%define version_postfix p1
+
Name: ogre
-Version: 1.2.1
-Release: 3%{?dist}
+Version: 1.2.2
+Release: 1.%{version_postfix}%{?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 . -).tar.bz2
+Source0: http://dl.sf.net/sourceforge/ogre/ogre-linux_osx-v%(echo %{version} | tr . -)%{version_postfix}.tar.bz2
Patch0: ogre-1.2.1-rpath.patch
Patch1: ogre-1.2.1-gtkmm.patch
-Patch2: ogre-1.2.1-char_height.patch
-Patch3: ogre-1.2.1-visibility.patch
+Patch2: 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 +49,12 @@
%setup -q -n ogrenew
%patch0 -p1 -z .rpath
%patch1 -p1 -z .gtkmm
-%patch2 -p1 -z .char_height
-%patch3 -p1 -z .visibility
+%patch2 -p1 -z .soname
+# sigh stop autoxxx from rerunning because of our patches above.
+touch aclocal.m4
+touch configure
+touch `find -name Makefile.in`
+touch OgreMain/include/config.h.in
# we don't do this with a patch since we need %{_libdir}
sed -i 's|libOgrePlatform.so|%{_libdir}/OGRE/libOgrePlatform.so|' \
OgreMain/include/OgrePlatform.h
@@ -108,13 +113,14 @@
%doc AUTHORS BUGS COPYING
%doc Docs/ChangeLog.html Docs/ReadMe.html Docs/style.css Docs/ogre-logo.gif
%{_bindir}/Ogre*
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*Ogre*-%{version}.so
%{_libdir}/OGRE
%{_datadir}/OGRE
%files devel
%defattr(-,root,root,-)
-%{_libdir}/lib*.so
+%{_libdir}/libOgreMain.so
+%{_libdir}/libCEGUIOgreRenderer.so
%{_includedir}/OGRE
%{_libdir}/pkgconfig/*.pc
@@ -124,6 +130,18 @@
%changelog
+* Thu Jul 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-1.p1
+- New upstream release 1.2.2p1
+- Drop integrated char_height patch
+- Drop ogre-1.2.1-visibility.patch since this is fixed with the latest gcc
+ release, but keep it in CVS in case things break again.
+- Add a patch that replaces -version-info libtool argument with -release,
+ which results in hardcoding the version number into the soname. This is
+ needed because upstream changes the ABI every release, without changing the
+ CURRENT argument passed to -version-info .
+- Also add -release when linking libCEGUIOgreRenderer.so as that was previously
+ unversioned.
+
* Tue Jul 18 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-3
- Add ogre-1.2.1-visibility.patch to fix issues with the interesting new
gcc visibility inheritance.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ogre/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Jul 2006 18:24:11 -0000 1.2
+++ sources 1 Aug 2006 12:31:47 -0000 1.3
@@ -1 +1 @@
-6ff98b1f14ca679ceaeec00daff2ff87 ogre-linux_osx-v1-2-1.tar.bz2
+34004bdde39427e9a3213286f8cc057a ogre-linux_osx-v1-2-2p1.tar.bz2
More information about the scm-commits
mailing list