[zyGrib] 5.0.6-8
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 19 17:49:05 UTC 2012
commit 203229033644f82c549fe73e3d1999328bf3d79d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Oct 19 12:49:09 2012 -0500
5.0.6-8
- drop hard-coded library dependencies (rpm autodetects these)
- drop some sed hacks (rebase patches)
- fix build for qwt5 compat pkg
...alldata.patch => zyGrib-5.0.6-installdata.patch | 65 +++++++-------------
zyGrib-5.0.6-libs.patch | 62 +++++++++++++++++++
zyGrib-5.0.6-no_qwt.patch | 14 ++++
zyGrib-libs.patch | 38 -----------
zyGrib.spec | 33 +++++++---
5 files changed, 121 insertions(+), 91 deletions(-)
---
diff --git a/zyGrib-installdata.patch b/zyGrib-5.0.6-installdata.patch
similarity index 51%
rename from zyGrib-installdata.patch
rename to zyGrib-5.0.6-installdata.patch
index ef94e59..92061bd 100644
--- a/zyGrib-installdata.patch
+++ b/zyGrib-5.0.6-installdata.patch
@@ -1,12 +1,24 @@
---- a/Makefile 2011-10-30 12:19:58.523694120 +0400
-+++ b/Makefile 2011-10-30 12:21:21.919691639 +0400
-@@ -50,15 +50,9 @@
+diff -up zyGrib-5.0.6/Makefile.installdata zyGrib-5.0.6/Makefile
+--- zyGrib-5.0.6/Makefile.installdata 2012-10-19 12:41:23.815816693 -0500
++++ zyGrib-5.0.6/Makefile 2012-10-19 12:41:43.137579656 -0500
+@@ -2,7 +2,8 @@ QTBIN=/usr/bin
+ #QTBIN=/opt/qt/qt/bin
+ #QTBIN=/usr/local/Trolltech/Qt-4.7.0/bin
+
+-INSTALLDIR=$(HOME)/zyGrib
++DESTDIR ?= ${HOME}
++INSTALLDIR=${DESTDIR}/usr/share/zyGrib
+
+ MACQTBIN=/opt/local/bin
+
+@@ -57,16 +58,7 @@ zyGrib: $(SRC)
install: zyGrib
mkdir -p $(INSTALLDIR)
- mkdir -p $(INSTALLDIR)/bin
cp -a data $(INSTALLDIR)
- rm -f ./zyGrib
+ #cp -a grib $(INSTALLDIR)
+- rm -f ./zyGrib
- rm -f $(INSTALLDIR)/bin/zyGrib
- cp -a src/zyGrib $(INSTALLDIR)/bin
- echo "#!/bin/bash" >> ./zyGrib
@@ -14,35 +26,13 @@
- echo 'bin/zyGrib $$*' >> ./zyGrib
- chmod 755 ./zyGrib
- cp -af zyGrib $(INSTALLDIR)
-+ rm -f $(DESTDIR)/usr/bin/zyGrib
-+ cp -a src/zyGrib $(DESTDIR)/usr/bin/zyGrib
-
-
---- a/Makefile 2011-10-30 12:49:20.833641694 +0400
-+++ b/Makefile 2011-10-30 12:49:42.807641045 +0400
-@@ -50,6 +50,7 @@
+-
++ install -m755 -p -D src/zyGrib $(DESTDIR)/usr/bin/zyGrib
- install: zyGrib
- mkdir -p $(INSTALLDIR)
-+ mkdir -p ${DESTDIR}/usr/bin
- cp -a data $(INSTALLDIR)
- rm -f ./zyGrib
- rm -f $(DESTDIR)/usr/bin/zyGrib
---- a/Makefile 2011-10-30 12:53:49.762633696 +0400
-+++ b/Makefile 2011-10-30 12:54:52.785631821 +0400
-@@ -2,7 +2,8 @@
- #QTBIN=/opt/qt/qt/bin
- #QTBIN=/usr/local/Trolltech/Qt-4.7.0/bin
-
--INSTALLDIR=$(HOME)/zyGrib
-+DESTDIR ?= ${HOME}
-+INSTALLDIR=${DESTDIR}/usr/share/zyGrib
-
- MACQTBIN=/opt/local/bin
-
---- a/src/util/Util.h 2011-11-07 07:08:02.916519639 +0400
-+++ b/src/util/Util.h 2011-11-07 07:08:41.419518493 +0400
-@@ -66,10 +66,10 @@
+diff -up zyGrib-5.0.6/src/util/Util.h.installdata zyGrib-5.0.6/src/util/Util.h
+--- zyGrib-5.0.6/src/util/Util.h.installdata 2012-10-19 12:41:23.802816842 -0500
++++ zyGrib-5.0.6/src/util/Util.h 2012-10-19 12:41:23.817816669 -0500
+@@ -66,11 +66,11 @@ class Util : public QObject
public:
@@ -50,20 +40,11 @@
- static QString pathConfig () {return "config/";}
- static QString pathFonts () {return "fonts/";}
- static QString pathGis () {return "gis/";}
+- static QString pathGshhs () {return "maps/gshhs/";}
+ static QString pathColors () {return "/usr/share/zyGrib/data/colors/";}
+ static QString pathConfig () {return "/usr/share/zyGrib/data/config/";}
+ static QString pathFonts () {return "/usr/share/zyGrib/data/fonts/";}
+ static QString pathGis () {return "/usr/share/zyGrib/data/gis/";}
- static QString pathGshhs () {return "maps/gshhs/";}
- static QString pathStuff () {return "stuff/";}
-
---- a/src/util/Util.h 2011-11-07 10:39:37.318142013 +0400
-+++ b/src/util/Util.h 2011-11-07 10:39:52.993141546 +0400
-@@ -70,7 +70,7 @@
- static QString pathConfig () {return "/usr/share/zyGrib/data/config/";}
- static QString pathFonts () {return "/usr/share/zyGrib/data/fonts/";}
- static QString pathGis () {return "/usr/share/zyGrib/data/gis/";}
-- static QString pathGshhs () {return "maps/gshhs/";}
+ static QString pathGshhs () {return "/usr/share/zyGrib/data/maps/gshhs/";}
static QString pathStuff () {return "stuff/";}
diff --git a/zyGrib-5.0.6-libs.patch b/zyGrib-5.0.6-libs.patch
new file mode 100644
index 0000000..92af083
--- /dev/null
+++ b/zyGrib-5.0.6-libs.patch
@@ -0,0 +1,62 @@
+diff -up zyGrib-5.0.6/Makefile.libs zyGrib-5.0.6/Makefile
+--- zyGrib-5.0.6/Makefile.libs 2011-09-10 01:59:30.000000000 -0500
++++ zyGrib-5.0.6/Makefile 2012-10-19 10:49:05.404882006 -0500
+@@ -8,17 +8,17 @@ MACQTBIN=/opt/local/bin
+
+ all: zyGrib
+
+-SRC= src/*.h src/*.cpp \
+- src/*/*.h src/*/*.cpp src/*/*.c \
+- src/*/*/*.h src/*/*/*.c \
++SRC= src/*.h src/*.cpp
++ #src/*/*.h src/*/*.cpp src/*/*.c \
++ #src/*/*/*.h src/*/*/*.c \
+
+
+ mac: $(SRC)
+ rm -f ./zyGrib
+ rm -fr ./zyGrib.app
+- cd src/bzip2; $(MACQTBIN)/qmake; make
+- cd src/zlib-1.2.3; $(MACQTBIN)/qmake; make
+- cd src/proj-4.6.0/src/; $(MACQTBIN)/qmake; make
++ #cd src/bzip2; $(MACQTBIN)/qmake; make
++ #cd src/zlib-1.2.3; $(MACQTBIN)/qmake; make
++ #cd src/proj-4.6.0/src/; $(MACQTBIN)/qmake; make
+ cd src; $(MACQTBIN)/qmake; make
+
+ clean:
+@@ -33,9 +33,9 @@ veryclean:
+ rm -fr zyGrib.app
+ rm -f src/zyGrib
+ rm -f src/release/zyGrib.exe
+- cd src/bzip2; $(QTBIN)/qmake; make clean
+- cd src/zlib-1.2.3; $(QTBIN)/qmake; make clean
+- cd src/proj-4.6.0/src/; $(QTBIN)/qmake; make clean
++ #cd src/bzip2; $(QTBIN)/qmake; make clean
++ #cd src/zlib-1.2.3; $(QTBIN)/qmake; make clean
++ #cd src/proj-4.6.0/src/; $(QTBIN)/qmake; make clean
+ cd src; $(QTBIN)/qmake; make clean
+ rm -f src/zlib-1.2.3/libz.a
+ rm -f src/proj-4.6.0/src/libproj.a
+@@ -45,9 +45,9 @@ zyGrib: $(SRC)
+ @ echo
+ @ echo
+ rm -f ./zyGrib
+- cd src/bzip2; $(QTBIN)/qmake; make
+- cd src/zlib-1.2.3; $(QTBIN)/qmake; make
+- cd src/proj-4.6.0/src/; $(QTBIN)/qmake; make
++ #cd src/bzip2; $(QTBIN)/qmake; make
++ #cd src/zlib-1.2.3; $(QTBIN)/qmake; make
++ #cd src/proj-4.6.0/src/; $(QTBIN)/qmake; make
+ cd src; $(QTBIN)/qmake; make
+ @ echo "-----------------------------------"
+ @ echo "#!/bin/bash" >> ./zyGrib
+@@ -59,7 +59,7 @@ install: zyGrib
+ mkdir -p $(INSTALLDIR)
+ mkdir -p $(INSTALLDIR)/bin
+ cp -a data $(INSTALLDIR)
+- cp -a grib $(INSTALLDIR)
++ #cp -a grib $(INSTALLDIR)
+ rm -f ./zyGrib
+ rm -f $(INSTALLDIR)/bin/zyGrib
+ cp -a src/zyGrib $(INSTALLDIR)/bin
diff --git a/zyGrib-5.0.6-no_qwt.patch b/zyGrib-5.0.6-no_qwt.patch
new file mode 100644
index 0000000..ff63752
--- /dev/null
+++ b/zyGrib-5.0.6-no_qwt.patch
@@ -0,0 +1,14 @@
+diff -up zyGrib-5.0.6/src/zyGrib.pro.no_qwt zyGrib-5.0.6/src/zyGrib.pro
+--- zyGrib-5.0.6/src/zyGrib.pro.no_qwt 2012-10-19 12:11:26.383781592 -0500
++++ zyGrib-5.0.6/src/zyGrib.pro 2012-10-19 12:25:49.216259865 -0500
+@@ -28,8 +28,8 @@ macx {
+ ICON = ../img/zyGrib.icns
+ }
+ else {
+- INCLUDEPATH += /usr/include/qwt-qt4/
+- LIBS += -lqwt-qt4
++ #INCLUDEPATH += /usr/include/qwt-qt4/
++ #LIBS += -lqwt-qt4
+ DESTDIR = .
+ }
+ }
diff --git a/zyGrib.spec b/zyGrib.spec
index 392dbb2..674128d 100644
--- a/zyGrib.spec
+++ b/zyGrib.spec
@@ -1,6 +1,6 @@
Name: zyGrib
Version: 5.0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Visualization of meteo data from files in GRIB Format 1
Group: Applications/Internet
License: GPLv3+
@@ -11,11 +11,19 @@ Source1: %{name}.png
Source2: %{name}.README
Source3: %{name}.desktop
Source4: %{name}.INSTALL
-Patch1: zyGrib-libs.patch
+Patch1: zyGrib-5.0.6-libs.patch
# https://bugzilla.redhat.com/733855
-Patch3: zyGrib-installdata.patch
-BuildRequires: bzip2-devel qt4-devel proj-devel desktop-file-utils qwt-devel
-Requires: qt-x11 proj qwt liberation-fonts-common
+Patch3: zyGrib-5.0.6-installdata.patch
+# qwt support is commented-out already, no need to link it.
+# Feel free to add when/if this is fixed -- rex
+Patch4: zyGrib-5.0.6-no_qwt.patch
+#if 0%{?fedora} > 17
+#BuildRequires: pkgconfig(qwt5-qt4)
+#else
+#BuildRequires: qwt-devel
+#endif
+BuildRequires: bzip2-devel qt4-devel proj-devel desktop-file-utils
+Requires: liberation-fonts-common
%description
ZyGrib is a GRIB file viewer. It enables :
@@ -32,17 +40,15 @@ rm -rf src/proj-*
# Adding docs files
cp -pr %{SOURCE2} %{_builddir}/%{name}-%{version}/README
cp -pr %{SOURCE4} %{_builddir}/%{name}-%{version}/INSTALL
-# Fedora specific replace
-sed -i 's/qwt-qt4/qwt/g' src/zyGrib.pro
-sed -i 's/qmake/qmake-qt4/g' Makefile
# https://bugzilla.redhat.com/733855
sed -i -e 's:QDir\:\:current():"%{_datadir}\/%{name}\/":' src/util/Settings.cpp
sed -i -e 's:data/::g' src/util/Util.h src/curvedrawer/CurveDrawerDialog.ui src/Makefile src/zyGrib.pro
-%patch1 -p1
-%patch3 -p1
+%patch1 -p1 -b .libs
+%patch3 -p1 -b .installdata
+%patch4 -p1 -b .no_qwt
%build
-make %{?_smp_mflags}
+make %{?_smp_mflags} QTBIN=%{_qt4_bindir}
%install
rm -rf %{buildroot}
@@ -69,6 +75,11 @@ install -d -m755 %{buildroot}%{_datadir}/applications
%changelog
+* Fri Oct 19 2012 Rex Dieter <rdieter at fedoraproject.org> - 5.0.6-8
+- drop hard-coded library dependencies (rpm autodetects these)
+- drop some sed hacks (rebase patches)
+- fix build for qwt5 compat pkg
+
* Sat Oct 13 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.6-7
- Rebuild for new proj
More information about the scm-commits
mailing list