[zhu3d/f17] Package Update
siddharths
siddharths at fedoraproject.org
Fri Mar 2 12:23:38 UTC 2012
commit 1d412fff4615e44c76c470257657d7fd6494b54b
Author: Siddharth Sharma <siddharth.kde at gmail.com>
Date: Fri Mar 2 17:54:16 2012 +0530
Package Update
.gitignore | 1 +
libglu.patch | 11 +++++++++++
sources | 2 +-
zhu3d.desktop | 2 +-
zhu3d.spec | 16 ++++++++++------
5 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index efe8036..29793d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/zhu3d-4.2.2.tar.gz
+/zhu3d-4.2.4.tar.gz
diff --git a/libglu.patch b/libglu.patch
new file mode 100644
index 0000000..0d8486c
--- /dev/null
+++ b/libglu.patch
@@ -0,0 +1,11 @@
+--- zhu3d-old/zhu3d.pro 2012-01-10 21:48:42.000000000 +0530
++++ zhu3d-moded/zhu3d.pro 2012-01-19 18:43:42.967919928 +0530
+@@ -48,7 +48,7 @@ TEMPLATE = app
+ CONFIG += release
+ TARGET = zhu3d
+ QT += opengl
+-
++LIBS += -lGLU
+
+ # ============================================================================
+ # Optimisation switches. For both GCC/ICC compilers -O3 is default.
diff --git a/sources b/sources
index 0eb3fe4..3b20632 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d80f60ef45a1bdf6bb4aef1103d931fe zhu3d-4.2.2.tar.gz
+c298c95936acce297a3d5616b2ea9d26 zhu3d-4.2.4.tar.gz
diff --git a/zhu3d.desktop b/zhu3d.desktop
index 51af282..2e93091 100644
--- a/zhu3d.desktop
+++ b/zhu3d.desktop
@@ -7,7 +7,7 @@ Type=Application
GenericName=Function viewer and solver
Terminal=false
X-KDE-StartupNotify=true
-Categories=Qt;KDE;
+Categories=KDE;Qt;Utility;Calculator;
diff --git a/zhu3d.spec b/zhu3d.spec
index 3f97e6b..ca56e4a 100644
--- a/zhu3d.spec
+++ b/zhu3d.spec
@@ -1,13 +1,14 @@
Name: zhu3d
-Version: 4.2.2
-Release: 4%{dist}
+Version: 4.2.4
+Release: 1%{dist}
Summary: Interactive OpenGL-based mathematical function viewer
Group: Applications/System
License: GPLv3
URL: http://www.sourceforge.net/projects/zhu3d
Source0: http://sourceforge.net/projects/zhu3d/files/zhu3d/%{name}-%{version}.tar.gz
Source1: zhu3d.desktop
-Patch1: pri.patch
+Patch00: pri.patch
+Patch01: libglu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake make qt4-devel desktop-file-utils dos2unix
@@ -20,7 +21,8 @@ transparency, textures, fog and motion blur
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .pri
+%patch00 -p1 -b .pri
+%patch01 -p1 -b .libglu
find . -type f -print0|xargs -0 chmod -x
dos2unix readme.txt license.gpl
@@ -30,7 +32,7 @@ PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-qmake-qt4 -r IDE_LIBRARY_BASENAME=%{_lib}
+%{_qt4_qmake} -r IDE_LIBRARY_BASENAME=%{_lib}
make %{?_smp_mflags}
%install
@@ -72,13 +74,15 @@ rm -rf %{buildroot}
%{_datadir}/applications/zhu3d.desktop
%changelog
+* Fri Mar 2 2012 siddvicious <siddharth.kde at gmail.com> - 4.2.4-1
+- Package Update
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
* Sun Jan 30 2011 siddharth Sharma <siddharths at fedoraproject.org> - 4.2.2-2
- Fixes
- Changelog fix 4.2.4 to 4.2.2
More information about the scm-commits
mailing list