[zyGrib] New upstream version 5.0.2

[Pavel Zhukov]

commit 5e599ad342c9a124479c25b9ba5418a86b1ae192
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Fri Aug 5 10:13:34 2011 +0400

    New upstream version 5.0.2

 .gitignore        |    1 +
 sources           |    2 +-
 zyGrib-libs.patch |   30 +++++++++---------------------
 zyGrib.spec       |   15 +++++++++------
 4 files changed, 20 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 580f2cb..81d3674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zyGrib-3.9.9.tgz
+/zyGrib-5.0.2.tgz
diff --git a/sources b/sources
index ea29a78..4d870e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0fec0b17eb30913f79cb284dfb4035c  zyGrib-3.9.9.tgz
+0a97203f7a8917977556fb654fc6d019  zyGrib-5.0.2.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.spec b/zyGrib.spec
index 0755d2e..e461c40 100644
--- a/zyGrib.spec
+++ b/zyGrib.spec
@@ -1,6 +1,6 @@
 Name:           zyGrib
-Version:        3.9.9
-Release:        3%{?dist}
+Version:        5.0.2
+Release:        1%{?dist}
 Summary:        Visualization of meteo data from files in GRIB Format 1 
 Group:          Applications/Internet
 License:        GPLv3+
@@ -47,9 +47,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 +64,10 @@ 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
+* 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