rpms/qosmic/devel qosmic-1.3-qosmic.cpp.patch, NONE, 1.1 qosmic-1.3-qosmic.pro.patch, 1.1, 1.2 qosmic.desktop, 1.1, 1.2 qosmic.spec, 1.3, 1.4

[Ian Weller (ianweller)]

Author: ianweller

Update of /cvs/pkgs/rpms/qosmic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3791/devel

Modified Files:
	qosmic-1.3-qosmic.pro.patch qosmic.desktop qosmic.spec 
Added Files:
	qosmic-1.3-qosmic.cpp.patch 
Log Message:
update to 1.3-2

qosmic-1.3-qosmic.cpp.patch:

--- NEW FILE qosmic-1.3-qosmic.cpp.patch ---
diff -up qosmic/src/qosmic.cpp.orig qosmic/src/qosmic.cpp
--- qosmic/src/qosmic.cpp.orig	2008-03-01 23:33:32.000000000 -0600
+++ qosmic/src/qosmic.cpp	2008-03-01 23:36:32.000000000 -0600
@@ -35,6 +35,8 @@ int main(int argc, char* argv[])
 
 	if (QFileInfo(palettes).exists())
 		setenv("flam3_palettes", palettes.toAscii().data(), 0);
+	else if (QFileInfo("/usr/share/flam3/flam3-palettes.xml").exists())
+		setenv("flam3_palettes","/usr/share/flam3/flam3-palettes.xml", 0);
 	else if (QFileInfo("./flam3-palettes.xml").exists())
 		setenv("flam3_palettes","./flam3-palettes.xml", 0);
 	else if (QFileInfo("./flam3/flam3-palettes.xml").exists())
@@ -43,6 +45,7 @@ int main(int argc, char* argv[])
 	{
 		cout << "Error: No palettes file found in\n\n" <<
 				palettes << "\n" <<
+				"/usr/share/flam3/flam3-palettes.xml\n" <<
 				"./flam3-palettes.xml\n" <<
 				"./flam3/flam3-palettes.xml\n" <<
 				getenv("flam3_palettes") << "\n\n" <<

qosmic-1.3-qosmic.pro.patch:

Index: qosmic-1.3-qosmic.pro.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic-1.3-qosmic.pro.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qosmic-1.3-qosmic.pro.patch	19 Feb 2008 05:07:03 -0000	1.1
+++ qosmic-1.3-qosmic.pro.patch	2 Mar 2008 05:53:18 -0000	1.2
@@ -1,8 +1,10 @@
 diff -up qosmic/qosmic.pro.orig qosmic/qosmic.pro
 --- qosmic/qosmic.pro.orig	2008-02-18 22:18:44.000000000 -0600
-+++ qosmic/qosmic.pro	2008-02-18 22:20:44.000000000 -0600
-@@ -2,18 +2,18 @@
- PREFIX = /usr/local
++++ qosmic/qosmic.pro	2008-03-01 23:04:23.000000000 -0600
+@@ -1,19 +1,19 @@
+ # installation prefix on *nix/osx
+-PREFIX = /usr/local
++PREFIX = /usr
  
  # Most people need not muck about below here
 -!contains(QT_MAJOR_VERSION, 4){


Index: qosmic.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qosmic.desktop	9 Feb 2008 20:50:11 -0000	1.1
+++ qosmic.desktop	2 Mar 2008 05:53:18 -0000	1.2
@@ -7,4 +7,4 @@
 Icon=qosmic
 Terminal=false
 Type=Application
-Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt
+Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt;


Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qosmic.spec	19 Feb 2008 05:07:03 -0000	1.3
+++ qosmic.spec	2 Mar 2008 05:53:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           qosmic
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 Source1:        http://students.washington.edu/bitsed/qosmic/images/icon.jpg
 Source2:        qosmic.desktop
 Patch0:         qosmic-1.3-qosmic.pro.patch
-#Patch1:        qosmic-1.2-qosmic.cpp.patch
+Patch1:         qosmic-1.3-qosmic.cpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flam3-devel
@@ -26,8 +26,8 @@
 
 %prep
 %setup -q -n qosmic
-%patch0 -p1 -b qosmic.pro
-#%patch1 -p1 -b qosmic.cpp
+%patch0 -p1 -b .qosmic_pro
+%patch1 -p1 -b .qosmic_cpp
 
 
 %build
@@ -63,6 +63,11 @@
 
 
 %changelog
+* Sat Mar 01 2008 Ian Weller <ianweller at gmail.com> 1.3-2
+- Once again qosmic failed to start because it couldn't find the palettes,
+  hopefully fixed for good this time
+- Made a small change to qosmic.desktop
+
 * Mon Feb 18 2008 Ian Weller <ianweller at gmail.com> 1.3-1
 - Updated upstream