rpms/qosmic/F-8 qosmic-secant-secant2.patch, NONE, 1.1 qosmic.spec, 1.5, 1.6

Ian Weller (ianweller) fedora-extras-commits at redhat.com
Sat Mar 22 18:28:11 UTC 2008


Author: ianweller

Update of /cvs/pkgs/rpms/qosmic/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10377/F-8

Modified Files:
	qosmic.spec 
Added Files:
	qosmic-secant-secant2.patch 
Log Message:
updating qosmic to 1.3.1-2 in F-8

qosmic-secant-secant2.patch:

--- NEW FILE qosmic-secant-secant2.patch ---
diff -up qosmic/src/lua/luathread.cpp.orig qosmic/src/lua/luathread.cpp
--- qosmic/src/lua/luathread.cpp.orig	2008-03-11 03:24:26.000000000 -0500
+++ qosmic/src/lua/luathread.cpp	2008-03-22 12:14:17.000000000 -0500
@@ -122,7 +122,7 @@ void LuaThread::lua_load_environment(lua
 	lua_pushinteger(L, VAR_SQUARE); lua_setglobal(L, "SQUARE");
 	lua_pushinteger(L, VAR_RAYS); lua_setglobal(L, "RAYS");
 	lua_pushinteger(L, VAR_BLADE); lua_setglobal(L, "BLADE");
-	lua_pushinteger(L, VAR_SECANT); lua_setglobal(L, "SECANT");
+	lua_pushinteger(L, VAR_SECANT2); lua_setglobal(L, "SECANT");
 	lua_pushinteger(L, VAR_TWINTRIAN); lua_setglobal(L, "TWINTRIAN");
 	lua_pushinteger(L, VAR_CROSS); lua_setglobal(L, "CROSS");
 	lua_pushinteger(L, VAR_DISC2); lua_setglobal(L, "DISC2");


Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/qosmic.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qosmic.spec	12 Mar 2008 05:00:54 -0000	1.5
+++ qosmic.spec	22 Mar 2008 18:27:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qosmic
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
 Group:          Applications/Multimedia
@@ -11,14 +11,15 @@
 Source2:        qosmic.desktop
 Patch0:         qosmic-1.3-qosmic.pro.patch
 Patch1:         qosmic-1.3-qosmic.cpp.patch
+Patch2:         qosmic-secant-secant2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flam3-devel
+BuildRequires:  flam3-devel >= 2.7.10
 BuildRequires:  qt4-devel >= 4.3.1
 BuildRequires:  ImageMagick
 BuildRequires:  desktop-file-utils
 BuildRequires:  lua-devel
-Requires:       flam3
+Requires:       flam3 >= 2.7.10
 
 %description
 Qosmic is a nifty toy with which you can edit and render flam3 fractal images.
@@ -28,6 +29,7 @@
 %setup -q -n qosmic
 %patch0 -p1 -b .qosmic_pro
 %patch1 -p1 -b .qosmic_cpp
+%patch2 -p1 -b .secant
 
 
 %build
@@ -63,6 +65,11 @@
 
 
 %changelog
+* Sat Mar 22 2008 Ian Weller <ianweller at gmail.com> 1.3.1-2
+- Rebuildling for flam3 2.7.10: the new flam3 changes 'secant' to 'secant2',
+  so we must do likewise, and therefore this package only builds on 2.7.10
+  or above.
+
 * Tue Mar 11 2008 Ian Weller <ianweller at gmail.com> 1.3.1-1
 - Updated upstream
 




More information about the fedora-extras-commits mailing list