rpms/cegui/devel cegui-0.6.0-userverso.patch, 1.1, 1.2 cegui.spec, 1.10, 1.11

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	cegui-0.6.0-userverso.patch cegui.spec 
Log Message:
* Sun May 18 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.0-1
- New upstream release 0.6.0
- No ABI stability, use full versioned (libtool -release) sonames
- Use system tolua++, change license tag to match
- Use system tinyxml


cegui-0.6.0-userverso.patch:

Index: cegui-0.6.0-userverso.patch
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/cegui-0.6.0-userverso.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cegui-0.6.0-userverso.patch	19 May 2008 12:02:20 -0000	1.1
+++ cegui-0.6.0-userverso.patch	21 May 2008 20:56:45 -0000	1.2
@@ -1,33 +1,21 @@
---- CEGUI-0.6.0.orig/src/CEGUIDynamicModule.cpp	2008-02-08 23:50:51.000000000 +0300
-+++ CEGUI-0.6.0/src/CEGUIDynamicModule.cpp	2008-05-17 16:58:25.000000000 +0400
-@@ -87,6 +87,30 @@
-         if (d_moduleName.substr(0, 3) != "lib")
-         {
-             d_moduleName.insert(0, "lib");
+--- CEGUI-0.6.0/src/CEGUIDynamicModule.cpp~	2008-05-21 22:11:55.000000000 +0200
++++ CEGUI-0.6.0/src/CEGUIDynamicModule.cpp	2008-05-21 22:11:55.000000000 +0200
+@@ -65,6 +65,18 @@ DynamicModule::DynamicModule(const Strin
+ 	} // if(name.empty())
+ 
+ #if defined(__linux__)
++    // check if we are being asked to open a CEGUI .so, if so postfix the name
++    // with our package version
++    if (d_moduleName.substr(0, 5) == "CEGUI")
++        d_moduleName.substr(0, 8) == "libCEGUI")
++    {
++        // strip .so extension before postfixing, will get added again below
++        if (d_moduleName.substr(d_moduleName.length() - 3, 3) == ".so")
++            d_moduleName = d_moduleName.substr(0, d_moduleName.length() - 3);
++        d_moduleName += "-";
++        d_moduleName += PACKAGE_VERSION;
++    }
 +
-+            // Insist on opening the versioned .so so that the development package
-+            // does not need to be installed
-+            if (d_moduleName == "libCEGUIBase.so")
-+            {
-+                d_moduleName += ".1";
-+            }
-+            else if (d_moduleName == "libCEGUIFalagardWRBase.so")
-+            {
-+                d_moduleName += ".1";
-+            }
-+            else if (d_moduleName == "libCEGUILuaScriptModule.so")
-+            {
-+                d_moduleName += ".1";
-+            }
-+            else if (d_moduleName == "libCEGUItoluapp.so")
-+            {
-+                d_moduleName += ".1";
-+            }
-+            else
-+            {
-+                d_moduleName += ".0";
-+            }
-+
-             d_handle = DYNLIB_LOAD(d_moduleName.c_str());
-         }
-     }
+     // dlopen() does not add .so to the filename, like windows does for .dll
+     if (d_moduleName.substr(d_moduleName.length() - 3, 3) != ".so")
+         d_moduleName += ".so";


Index: cegui.spec
===================================================================
RCS file: /cvs/extras/rpms/cegui/devel/cegui.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cegui.spec	19 May 2008 12:02:20 -0000	1.10
+++ cegui.spec	21 May 2008 20:56:45 -0000	1.11
@@ -58,7 +58,7 @@
 
 %prep
 %setup -qb1 -qn CEGUI-%{version}
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1