rpms/qosmic/F-8 icon.jpg, NONE, 1.1 qosmic-1.2-qosmic.cpp.patch, NONE, 1.1 qosmic-1.2-qosmic.pro.patch, NONE, 1.1 qosmic.desktop, NONE, 1.1 qosmic.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Ian Weller (ianweller)]

Author: ianweller

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

Modified Files:
	.cvsignore sources 
Added Files:
	icon.jpg qosmic-1.2-qosmic.cpp.patch 
	qosmic-1.2-qosmic.pro.patch qosmic.desktop qosmic.spec 
Log Message:
initial import of qosmic into F-8


qosmic-1.2-qosmic.cpp.patch:

--- NEW FILE qosmic-1.2-qosmic.cpp.patch ---
--- qosmic/src/qosmic.cpp.orig  2007-12-16 06:49:49.000000000 -0600
+++ qosmic/src/qosmic.cpp       2008-02-06 17:36:33.000000000 -0600
@@ -29,11 +29,13 @@
 int main(int argc, char* argv[])
 {
 	// look for flam3 palettes
-	if (QFileInfo("./flam3-palettes.xml").exists())
+	/*if (QFileInfo("./flam3-palettes.xml").exists())
 		setenv("flam3_palettes","./flam3-palettes.xml", 0);
 	else if (QFileInfo("./flam3/flam3-palettes.xml").exists())
 		setenv("flam3_palettes","./flam3/flam3-palettes.xml", 0);
-	else if (!QFileInfo(getenv("flam3_palettes")).exists())
+	else if (!QFileInfo(getenv("flam3_palettes")).exists())*/
+ 	setenv("flam3_palettes","/usr/share/flam3/flam3-palettes.xml", 0);
+	if (!QFileInfo(getenv("flam3_palettes")).exists())
 	{
 		cout << "Error: No palettes file found in\n\n" <<
 				"./flam3-palettes.xml\n" <<

qosmic-1.2-qosmic.pro.patch:

--- NEW FILE qosmic-1.2-qosmic.pro.patch ---
--- qosmic/qosmic.pro.orig   2008-01-21 20:16:05.000000000 -0600
+++ qosmic/qosmic.pro        2008-01-28 22:23:09.000000000 -0600
@@ -2,18 +2,18 @@
 PREFIX = /usr/local
 
 # Most people need not muck about below here
-!contains(QT_MAJOR_VERSION, 4){
-    error(qosmic requires Qt >=4.3)
-}
-contains(QT_MINOR_VERSION, 2){
-    error(qosmic requires Qt >=4.3)
-}
-contains(QT_MINOR_VERSION, 1){
-    error(qosmic requires Qt >=4.3)
-}
-contains(QT_MINOR_VERSION, 0){
-    error(qosmic requires Qt >=4.3)
-}
+#!contains(QT_MAJOR_VERSION, 4){
+#    error(qosmic requires Qt >=4.3)
+#}
+#contains(QT_MINOR_VERSION, 2){
+#    error(qosmic requires Qt >=4.3)
+#}
+#contains(QT_MINOR_VERSION, 1){
+#    error(qosmic requires Qt >=4.3)
+#}
+#contains(QT_MINOR_VERSION, 0){
+#    error(qosmic requires Qt >=4.3)
+#}
 
 SUBDIRS +=TEMPLATE = subdirs app
 CONFIG += qt thread warn_off
@@ -25,7 +25,7 @@ RESOURCES = qosmic.qrc
 DEFINES += NAMEVER='"\\"version $$VERSION\\""'
 DESTDIR = .
 
-INCLUDEPATH += src flam3 /usr/include/libxml2
+INCLUDEPATH += src /usr/include/flam3 /usr/include/libxml2
 LIBS = -Lflam3 $$LIBS \
 -lm \
 -lflam3 \


--- NEW FILE qosmic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Qosmic Fractal Flame Editor
GenericName=Fractal Flame Editor
Comment=Edit and render fractal flames
Exec=qosmic
Icon=qosmic
Terminal=false
Type=Application
Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Qt


--- NEW FILE qosmic.spec ---
Name:           qosmic
Version:        1.2
Release:        2%{?dist}
Summary:        A cosmic recursive fractal flame editor written in Qt4

Group:          Applications/Multimedia
License:        GPLv2
URL:            http://students.washington.edu/bitsed/qosmic/
Source0:        http://students.washington.edu/bitsed/qosmic/public/qosmic-%{version}.tar.bz2
Source1:        http://students.washington.edu/bitsed/qosmic/images/icon.jpg
Source2:        qosmic.desktop
Patch0:         qosmic-1.2-qosmic.pro.patch
Patch1:         qosmic-1.2-qosmic.cpp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  flam3-devel
BuildRequires:  qt4-devel >= 4.3.1
BuildRequires:  ImageMagick
BuildRequires:  desktop-file-utils
Requires:       flam3

%description
Qosmic is a nifty toy with which you can edit and render flam3 fractal images.
It is comparable to Apophysis for Windows, with the same basic interface.

%prep
%setup -q -n qosmic
%patch0 -p1 -b qosmic.pro
%patch1 -p1 -b qosmic.cpp


%build
qmake-qt4
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -cpm 755 qosmic $RPM_BUILD_ROOT%{_bindir}/
convert %{SOURCE1} icon.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -cpm 644 icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/qosmic.png
desktop-file-install --vendor="fedora" \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
  %{SOURCE2}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/qosmic
%{_datadir}/applications/fedora-qosmic.desktop
%{_datadir}/pixmaps/qosmic.png
%doc README
%doc COPYING
%doc changes.txt



%changelog
* Wed Feb 06 2008 Ian Weller <ianweller at gmail.com> 1.2-2
- Fixed the fact that qosmic wouldn't even build (added BuildRequires)
- Fixed the fact that qosmic wouldn't even run (Patch1)

* Mon Jan 28 2008 Ian Weller <ianweller at gmail.com> 1.2-1
- First package build.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Feb 2008 19:52:12 -0000	1.1
+++ .cvsignore	9 Feb 2008 23:30:29 -0000	1.2
@@ -0,0 +1 @@
+qosmic-1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Feb 2008 19:52:12 -0000	1.1
+++ sources	9 Feb 2008 23:30:29 -0000	1.2
@@ -0,0 +1 @@
+dad5b8e4c2cd7091734c22a5220a6dd3  qosmic-1.2.tar.bz2