[zyGrib/f15] New release. Bugfixes (#746896 #746897 #746892 #746897 #751521)

Pavel Zhukov landgraf at fedoraproject.org
Mon Nov 7 07:35:27 UTC 2011 

commit 5e881c174c1447a3059b738c3f8b8ba2326a386c
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Mon Nov 7 11:35:10 2011 +0400

    New release. Bugfixes (#746896 #746897  #746892  #746897  #751521)

 .gitignore               |    1 +
 sources                  |    6 +---
 zyGrib-installdata.patch |   70 ++++++++++++++++++++++++++++++++++++++++++++++
 zyGrib-paths.patch       |   11 -------
 zyGrib.desktop           |    2 +-
 zyGrib.spec              |   29 ++++++++++++-------
 6 files changed, 91 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c01188..0b0f2dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /zyGrib-5.0.4.tgz
 =======
 >>>>>>> master
+/zyGrib-5.0.6.tgz
diff --git a/sources b/sources
index 57e8d62..1989ea2 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d0e3ff5f33c9eb63fa13d00b58857c2a  zyGrib-5.0.4.tgz
-=======
-0a97203f7a8917977556fb654fc6d019  zyGrib-5.0.2.tgz
->>>>>>> master
+ce2811a7abe9cc8f6703374130add902  zyGrib-5.0.6.tgz
diff --git a/zyGrib-installdata.patch b/zyGrib-installdata.patch
new file mode 100644
index 0000000..ef94e59
--- /dev/null
+++ b/zyGrib-installdata.patch
@@ -0,0 +1,70 @@
+--- a/Makefile	2011-10-30 12:19:58.523694120 +0400
++++ b/Makefile	2011-10-30 12:21:21.919691639 +0400
+@@ -50,15 +50,9 @@
+ 
+ install: zyGrib
+ 	mkdir -p $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/bin
+ 	cp -a data $(INSTALLDIR)
+ 	rm -f ./zyGrib
+-	rm -f $(INSTALLDIR)/bin/zyGrib
+-	cp  -a src/zyGrib $(INSTALLDIR)/bin
+-	echo "#!/bin/bash" >> ./zyGrib
+-	echo "cd $(INSTALLDIR)" >> ./zyGrib
+-	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: 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 @@
+     
+     public:
+ 		
+-	static QString pathColors () {return "colors/";}
+-	static QString pathConfig () {return "config/";}
+-	static QString pathFonts ()  {return "fonts/";}
+-	static QString pathGis ()    {return "gis/";}
++	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/";}
+ 	
+ 	static QString pathImg (const char *fname) {return QString("img/")+fname;}
diff --git a/zyGrib.desktop b/zyGrib.desktop
index a9a7813..208c318 100644
--- a/zyGrib.desktop
+++ b/zyGrib.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=zyGrib
 GenericName=GRIB file viewer
-Comment=Multi-protocol Messaging Client
+Comment=GRIB file viewer
 Exec=zyGrib
 Icon=zyGrib
 Terminal=false
diff --git a/zyGrib.spec b/zyGrib.spec
index 788d413..5996652 100644
--- a/zyGrib.spec
+++ b/zyGrib.spec
@@ -1,6 +1,6 @@
 Name:           zyGrib
-Version:        5.0.4
-Release:        2%{?dist}
+Version:        5.0.6
+Release:        4%{?dist}
 Summary:        Visualization of meteo data from files in GRIB Format 1 
 Group:          Applications/Internet
 License:        GPLv3+
@@ -13,7 +13,7 @@ Source3:        %{name}.desktop
 Source4:        %{name}.INSTALL
 Patch1:         zyGrib-libs.patch
 # https://bugzilla.redhat.com/733855
-Patch2:         zyGrib-paths.patch
+Patch3:         zyGrib-installdata.patch
 BuildRequires:  bzip2-devel qt4-devel proj-devel desktop-file-utils qwt-devel
 Requires:       qt-x11 proj qwt liberation-fonts-common
 %description
@@ -39,23 +39,25 @@ sed -i 's/qmake/qmake-qt4/g' Makefile
 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 
+%patch3 -p1
 
 %build
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-install -d -m755 %{buildroot}%{_bindir}
-install -D -m755 src/%{name} %{buildroot}%{_bindir}
-install -d -m755 %{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
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
+make install DESTDIR=%{buildroot}
+## install -d -m755 %{buildroot}%{_bindir}
+## install -D -m755 src/%{name} %{buildroot}%{_bindir}
+## install -d -m755 %{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
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
+
 
 %files
 %defattr(-,root,root,-)
@@ -65,7 +67,12 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 
+
 %changelog
+* Mon Nov 07 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.6-4
+- New release
+- Fix path (#746896, #746897, #746892, #746897, #751521)
+
 * Sat Aug 27 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 5.0.4-2
 - Fix maps path (#733855)

More information about the scm-commits mailing list