rpms/qosmic/F-7 qosmic-1.3.2-patches.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 qosmic.spec, 1.7, 1.8 sources, 1.5, 1.6 qosmic-1.3-qosmic.cpp.patch, 1.1, NONE qosmic-1.3-qosmic.pro.patch, 1.2, NONE qosmic-secant-secant2.patch, 1.1, NONE
Ian Weller (ianweller)
fedora-extras-commits at redhat.com
Mon May 12 04:36:55 UTC 2008
- Previous message (by thread): rpms/qosmic/F-8 qosmic-1.3.2-patches.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 qosmic.spec, 1.7, 1.8 sources, 1.5, 1.6 qosmic-1.3-qosmic.cpp.patch, 1.1, NONE qosmic-1.3-qosmic.pro.patch, 1.2, NONE qosmic-secant-secant2.patch, 1.1, NONE
- Next message (by thread): rpms/nginx/devel 404.html, NONE, 1.1 50x.html, NONE, 1.1 index.html, NONE, 1.1 nginx-logo.png, NONE, 1.1 poweredby.png, NONE, 1.1 ssl.conf, NONE, 1.1 upstream-fair.conf, NONE, 1.1 virtual.conf, NONE, 1.1 nginx-auto-install.patch, 1.1, 1.2 nginx-conf.patch, 1.1, 1.2 nginx.init, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ianweller
Update of /cvs/pkgs/rpms/qosmic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22631/F-7
Modified Files:
.cvsignore qosmic.spec sources
Added Files:
qosmic-1.3.2-patches.patch
Removed Files:
qosmic-1.3-qosmic.cpp.patch qosmic-1.3-qosmic.pro.patch
qosmic-secant-secant2.patch
Log Message:
importing qosmic into F-7
qosmic-1.3.2-patches.patch:
--- NEW FILE qosmic-1.3.2-patches.patch ---
diff -up qosmic/src/qosmic.cpp.orig qosmic/src/qosmic.cpp
--- qosmic/src/qosmic.cpp.orig 2008-04-10 17:54:16.000000000 -0500
+++ qosmic/src/qosmic.cpp 2008-04-10 17:54:56.000000000 -0500
@@ -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())
diff -up qosmic/qosmic.pro.orig qosmic/qosmic.pro
--- qosmic/qosmic.pro.orig 2008-04-10 17:50:44.000000000 -0500
+++ qosmic/qosmic.pro 2008-04-10 17:59:18.000000000 -0500
@@ -1,16 +1,16 @@
-!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 ##########
@@ -42,7 +42,7 @@ INSTALLS += target
SUBDIRS +=TEMPLATE = subdirs app
RESOURCES = qosmic.qrc
DESTDIR = .
-INCLUDEPATH += src /usr/include/libxml2
+INCLUDEPATH += src /usr/include/flam3 /usr/include/libxml2
LIBS += -lflam3 -lm -ljpeg -lxml2 -llua
FORMS += \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 12 Mar 2008 05:02:45 -0000 1.4
+++ .cvsignore 12 May 2008 04:36:17 -0000 1.5
@@ -1 +1 @@
-qosmic-1.3.1.tar.bz2
+qosmic-1.3.2.tar.bz2
Index: qosmic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-7/qosmic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qosmic.spec 2 Apr 2008 23:06:03 -0000 1.7
+++ qosmic.spec 12 May 2008 04:36:17 -0000 1.8
@@ -1,6 +1,6 @@
Name: qosmic
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Summary: A cosmic recursive fractal flame editor written in Qt4
Group: Applications/Multimedia
@@ -9,17 +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.3-qosmic.pro.patch
-Patch1: qosmic-1.3-qosmic.cpp.patch
-Patch2: qosmic-secant-secant2.patch
+Patch0: qosmic-1.3.2-patches.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flam3-devel >= 2.7.10
+BuildRequires: flam3-devel >= 2.7.11
BuildRequires: qt4-devel >= 4.3.1
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: lua-devel
-Requires: flam3 >= 2.7.10
+Requires: flam3 >= 2.7.11
%description
Qosmic is a nifty toy with which you can edit and render flam3 fractal images.
@@ -27,9 +25,7 @@
%prep
%setup -q -n qosmic
-%patch0 -p1 -b .qosmic_pro
-%patch1 -p1 -b .qosmic_cpp
-%patch2 -p1 -b .secant
+%patch0 -p1 -b .patches
%build
@@ -65,6 +61,9 @@
%changelog
+* Thu Apr 10 2008 Ian Weller <ianweller at gmail.com> 1.3.2-1
+- Updated upstream
+
* Wed Apr 02 2008 Ian Weller <ianweller at gmail.com> 1.3.1-3
- Upstream updated their tarball without increasing the version number. Sneaky.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qosmic/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 2 Apr 2008 23:06:03 -0000 1.5
+++ sources 12 May 2008 04:36:17 -0000 1.6
@@ -1 +1 @@
-7e3a88c79aed19773277890dce6171e2 qosmic-1.3.1.tar.bz2
+222cf11193664511fabff53933acb92a qosmic-1.3.2.tar.bz2
--- qosmic-1.3-qosmic.cpp.patch DELETED ---
--- qosmic-1.3-qosmic.pro.patch DELETED ---
--- qosmic-secant-secant2.patch DELETED ---
- Previous message (by thread): rpms/qosmic/F-8 qosmic-1.3.2-patches.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 qosmic.spec, 1.7, 1.8 sources, 1.5, 1.6 qosmic-1.3-qosmic.cpp.patch, 1.1, NONE qosmic-1.3-qosmic.pro.patch, 1.2, NONE qosmic-secant-secant2.patch, 1.1, NONE
- Next message (by thread): rpms/nginx/devel 404.html, NONE, 1.1 50x.html, NONE, 1.1 index.html, NONE, 1.1 nginx-logo.png, NONE, 1.1 poweredby.png, NONE, 1.1 ssl.conf, NONE, 1.1 upstream-fair.conf, NONE, 1.1 virtual.conf, NONE, 1.1 nginx-auto-install.patch, 1.1, 1.2 nginx-conf.patch, 1.1, 1.2 nginx.init, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list