[zyGrib/f16] Fix maps path (#733855)
Pavel Zhukov
landgraf at fedoraproject.org
Thu Sep 1 17:38:06 UTC 2011
commit 8fb28758f33d2c877dd3c23a1f100bc677720820
Author: Pavel Zhukov <pavel at zhukoff.net>
Date: Thu Sep 1 21:37:28 2011 +0400
Fix maps path (#733855)
.gitignore | 1 +
sources | 2 +-
zyGrib-libs.patch | 30 +++++++++---------------------
zyGrib-paths.patch | 11 +++++++++++
zyGrib.spec | 31 +++++++++++++++++++++----------
5 files changed, 43 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 580f2cb..c445e7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/zyGrib-3.9.9.tgz
+/zyGrib-5.0.4.tgz
diff --git a/sources b/sources
index ea29a78..bb87b07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0fec0b17eb30913f79cb284dfb4035c zyGrib-3.9.9.tgz
+d0e3ff5f33c9eb63fa13d00b58857c2a zyGrib-5.0.4.tgz
diff --git a/zyGrib-libs.patch b/zyGrib-libs.patch
index 05a9adb..86da796 100644
--- a/zyGrib-libs.patch
+++ b/zyGrib-libs.patch
@@ -1,12 +1,12 @@
---- a/Makefile 2011-03-09 22:04:38.062567998 +0300
-+++ b/Makefile 2011-03-09 22:05:49.046567999 +0300
+--- a/Makefile 2011-08-05 07:41:17.044816756 +0400
++++ b/Makefile 2011-08-05 07:44:05.333816814 +0400
@@ -9,16 +9,12 @@
all: zyGrib
SRC= src/*.h src/*.cpp \
- src/*/*.h src/*/*.cpp src/*/*.c \
- src/*/*/*.h src/*/*/*.c \
-+ src/*/*.h src/*/*.cpp \
++ src/*/*.h src/*/*.cpp \
mac: $(SRC)
@@ -18,19 +18,7 @@
cd src; $(MACQTBIN)/qmake-qt4; make
clean:
-@@ -33,21 +29,12 @@
- rm -fr zyGrib.app
- rm -f src/zyGrib
- rm -f src/release/zyGrib.exe
-- cd src/bzip2; $(QTBIN)/qmake-qt4; make clean
-- cd src/zlib-1.2.3; $(QTBIN)/qmake-qt4; make clean
-- cd src/proj-4.6.0/src/; $(QTBIN)/qmake-qt4; make clean
- cd src; $(QTBIN)/qmake-qt4; make clean
-- rm -f src/zlib-1.2.3/libz.a
-- rm -f src/proj-4.6.0/src/libproj.a
-- rm -f src/bzip2/libbz2.a
-
- zyGrib: $(SRC)
+@@ -45,9 +41,6 @@
@ echo
@ echo
rm -f ./zyGrib
@@ -40,11 +28,11 @@
cd src; $(QTBIN)/qmake-qt4; make
@ echo "-----------------------------------"
@ echo "#!/bin/bash" >> ./zyGrib
-@@ -59,7 +46,6 @@
+@@ -59,7 +52,6 @@
mkdir -p $(INSTALLDIR)
mkdir -p $(INSTALLDIR)/bin
- cp -a fonts $(INSTALLDIR)
+ cp -a data $(INSTALLDIR)
- cp -a grib $(INSTALLDIR)
- cp -a img $(INSTALLDIR)
- cp -a maps $(INSTALLDIR)
- cp -a tr $(INSTALLDIR)
+ rm -f ./zyGrib
+ rm -f $(INSTALLDIR)/bin/zyGrib
+ cp -a src/zyGrib $(INSTALLDIR)/bin
diff --git a/zyGrib-paths.patch b/zyGrib-paths.patch
new file mode 100644
index 0000000..8350045
--- /dev/null
+++ b/zyGrib-paths.patch
@@ -0,0 +1,11 @@
+--- a/src/util/Util.h 2011-09-01 20:17:16.694749966 +0400
++++ b/src/util/Util.h 2011-09-01 20:19:15.606746468 +0400
+@@ -70,7 +70,7 @@
+ static QString pathConfig () {return "config/";}
+ static QString pathFonts () {return "fonts/";}
+ static QString pathGis () {return "gis/";}
+- static QString pathGshhs () {return "maps/gshhs/";}
++ static QString pathGshhs () {return "/usr/share/zyGrib/maps/gshhs/";}
+ static QString pathStuff () {return "stuff/";}
+
+ static QString pathImg (const char *fname) {return QString("img/")+fname;}
diff --git a/zyGrib.spec b/zyGrib.spec
index 0755d2e..788d413 100644
--- a/zyGrib.spec
+++ b/zyGrib.spec
@@ -1,6 +1,6 @@
Name: zyGrib
-Version: 3.9.9
-Release: 3%{?dist}
+Version: 5.0.4
+Release: 2%{?dist}
Summary: Visualization of meteo data from files in GRIB Format 1
Group: Applications/Internet
License: GPLv3+
@@ -12,6 +12,8 @@ Source2: %{name}.README
Source3: %{name}.desktop
Source4: %{name}.INSTALL
Patch1: zyGrib-libs.patch
+# https://bugzilla.redhat.com/733855
+Patch2: zyGrib-paths.patch
BuildRequires: bzip2-devel qt4-devel proj-devel desktop-file-utils qwt-devel
Requires: qt-x11 proj qwt liberation-fonts-common
%description
@@ -33,11 +35,11 @@ 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
-# Will be use by zyGrib-maps package
-sed -i -e 's:"maps\/:"%{_datadir}\/%{name}\/maps\/:g' src/map/GisReader.cpp src/MainWindow.cpp
-sed -i -e 's:"img\/:"%{_datadir}\/%{name}\/img\/:g' src/GribAnimator.cpp src/MenuBar.cpp
-sed -i -e 's:"tr\/:"%{_datadir}\/%{name}\/tr\/:g' src/MenuBar.cpp src/main.cpp
+# 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
+%patch2 -p1
%build
make %{?_smp_mflags}
@@ -47,9 +49,9 @@ rm -rf %{buildroot}
install -d -m755 %{buildroot}%{_bindir}
install -D -m755 src/%{name} %{buildroot}%{_bindir}
install -d -m755 %{buildroot}%{_datadir}/%{name}/tr
-cp -pr maps %{buildroot}%{_datadir}/%{name}
-cp -pr img %{buildroot}%{_datadir}/%{name}
-install -D -m644 tr/*.qm %{buildroot}%{_datadir}/%{name}/tr
+cp -pr data/maps %{buildroot}%{_datadir}/%{name}
+cp -pr data/img %{buildroot}%{_datadir}/%{name}
+install -D -m644 data/tr/*.qm %{buildroot}%{_datadir}/%{name}/tr
install -d -m755 %{buildroot}%{_datadir}/pixmaps
install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
install -d -m755 %{buildroot}%{_datadir}/applications
@@ -64,7 +66,16 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
%{_datadir}/applications/%{name}.desktop
%changelog
-* Wed Mar 09 2011 Pavel Zhukov <landgraf at fedoraproject.org> -3.9.9-3
+* Sat Aug 27 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.4-2
+- Fix maps path (#733855)
+
+* Sun Aug 07 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.4-1
+- New release
+
+* Fri Aug 05 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.2-1
+- New version
+
+* Wed Mar 09 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 3.9.9-3
- Remove system-wide libraries
- Add font Requires
- Replace pointless macros
More information about the scm-commits
mailing list