rpms/qosmic/devel qosmic-1.3-qosmic.pro.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qosmic.spec, 1.2, 1.3 sources, 1.2, 1.3 qosmic-1.2-qosmic.cpp.patch, 1.1, NONE qosmic-1.2-qosmic.pro.patch, 1.1, NONE

[Ian Weller (ianweller)]

Author: ianweller

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

Modified Files:
	.cvsignore qosmic.spec sources 
Added Files:
	qosmic-1.3-qosmic.pro.patch 
Removed Files:
	qosmic-1.2-qosmic.cpp.patch qosmic-1.2-qosmic.pro.patch 
Log Message:
update to qosmic 1.3-1

qosmic-1.3-qosmic.pro.patch:

--- NEW FILE qosmic-1.3-qosmic.pro.patch ---
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
 
 # 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)
+#}
 
 ## qmake tunables for application
 
@@ -37,7 +37,7 @@ INSTALLS += target
 SUBDIRS +=TEMPLATE = subdirs app
 RESOURCES = qosmic.qrc
 DESTDIR = .
-INCLUDEPATH += src flam3 /usr/include/libxml2
+INCLUDEPATH += src /usr/include/flam3 /usr/include/libxml2
 LIBS = -Lflam3/.libs $$LIBS -lflam3 -lm -ljpeg -lxml2 -llua
 
 FORMS += \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2008 20:50:11 -0000	1.2
+++ .cvsignore	19 Feb 2008 05:07:03 -0000	1.3
@@ -1 +1 @@
-qosmic-1.2.tar.bz2
+qosmic-1.3.tar.bz2


Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/qosmic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qosmic.spec	10 Feb 2008 00:23:00 -0000	1.2
+++ qosmic.spec	19 Feb 2008 05:07:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           qosmic
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        A cosmic recursive fractal flame editor written in Qt4
 
 Group:          Applications/Multimedia
@@ -9,14 +9,15 @@
 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
+Patch0:         qosmic-1.3-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
+BuildRequires:  lua-devel
 Requires:       flam3
 
 %description
@@ -26,7 +27,7 @@
 %prep
 %setup -q -n qosmic
 %patch0 -p1 -b qosmic.pro
-%patch1 -p1 -b qosmic.cpp
+#%patch1 -p1 -b qosmic.cpp
 
 
 %build
@@ -62,6 +63,9 @@
 
 
 %changelog
+* Mon Feb 18 2008 Ian Weller <ianweller at gmail.com> 1.3-1
+- Updated upstream
+
 * Sat Feb 09 2008 Ian Weller <ianweller at gmail.com> 1.2-3
 - Fixed License tag
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2008 20:50:11 -0000	1.2
+++ sources	19 Feb 2008 05:07:03 -0000	1.3
@@ -1 +1 @@
-dad5b8e4c2cd7091734c22a5220a6dd3  qosmic-1.2.tar.bz2
+fe0312c1c51a63ba272021c5f6a1cde4  qosmic-1.3.tar.bz2


--- qosmic-1.2-qosmic.cpp.patch DELETED ---


--- qosmic-1.2-qosmic.pro.patch DELETED ---