diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 421e9a3..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/zyGrib-3.9.9.tgz -/zyGrib-5.0.2.tgz -/zyGrib-5.0.6.tgz -/zyGrib-6.1.4.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3cd71f7 --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +2014-11-19: Retired because of broken dependencies during cleanup for Fedora 21 + diff --git a/sources b/sources deleted file mode 100644 index cc4b96a..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -c7472401fae0ad089042f51a05503f11 zyGrib-6.1.4.tgz diff --git a/zyGrib-6.1.4-installdata.patch b/zyGrib-6.1.4-installdata.patch deleted file mode 100644 index 5dba9f8..0000000 --- a/zyGrib-6.1.4-installdata.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/src/util/Util.h 2012-10-19 12:41:23.802816842 -0500 -+++ b/src/util/Util.h 2012-10-19 12:41:23.817816669 -0500 -@@ -66,11 +66,11 @@ class Util : public QObject - - public: - -- static QString pathColors () {return "colors/";} -- 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 "/usr/share/zyGrib/data/maps/gshhs/";} - static QString pathStuff () {return "stuff/";} - - static QString pathImg (const char *fname) {return QString("img/")+fname;} ---- a/src/util/Util.h 2013-05-14 20:13:56.423337620 +0200 -+++ b/src/util/Util.h 2013-05-14 20:15:26.852334930 +0200 -@@ -71,10 +71,10 @@ - static QString pathFonts () {return "/usr/share/zyGrib/data/fonts/";} - static QString pathGis () {return "/usr/share/zyGrib/data/gis/";} - static QString pathGshhs () {return "/usr/share/zyGrib/data/maps/gshhs/";} -- static QString pathStuff () {return "stuff/";} -+ static QString pathStuff () {return "/usr/share/zyGrib/stuff/";} - -- static QString pathImg (const char *fname) {return QString("img/")+fname;} -- static QString pathTr (QString lang) {return QString("tr/zyGrib_")+lang;} -+ static QString pathImg (const char *fname) {return QString("/usr/share/zyGrib/data/img/")+fname;} -+ static QString pathTr (QString lang) {return QString("/usr/share/zyGrib/data/tr/zyGrib_")+lang;} - static QString getServerName (); - - static void setSetting (const QString &key, const QVariant &value); ---- a/Makefile 2013-05-14 20:32:59.986303602 +0200 -+++ b/Makefile 2013-05-14 20:35:59.555298260 +0200 -@@ -2,7 +2,8 @@ - #QTBIN=/opt/qt/qt/bin - #QTBIN=/usr/local/Trolltech/Qt-4.7.0/bin - --INSTALLDIR=$(HOME)/zyGrib -+INSTALLDIR=${DESTDIR}/usr/share/zyGrib -+BINDIR=${DESTDIR}/usr/bin/ - - MACQTBIN=/opt/local/bin - -@@ -35,16 +36,11 @@ - - install: zyGrib - mkdir -p $(INSTALLDIR) -- mkdir -p $(INSTALLDIR)/bin -+ mkdir -p $(BINDIR) - cp -a data $(INSTALLDIR) - cp -a grib $(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 $(BINDIR)/zyGrib -+ cp -a src/zyGrib $(BINDIR)/ - - diff --git a/zyGrib-6.1.4-non_class_error.patch b/zyGrib-6.1.4-non_class_error.patch deleted file mode 100644 index e24f1ce..0000000 --- a/zyGrib-6.1.4-non_class_error.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/util/Settings.cpp 2013-05-14 19:50:45.687378991 +0200 -+++ b/src/util/Settings.cpp 2013-05-14 19:50:56.162378679 +0200 -@@ -95,8 +95,8 @@ - GLOB_SettingsFilename_POI = GLOB_SettingsDir + "/zygrib_poi.ini"; - - // A. Degwerth [Cassidian] added to make sure that the user dir contains an updated .ini file -- Settings::checkAndCopyDefaultIni(GLOB_SettingsFilename, QDir::current().absolutePath() + "/" + Util::pathConfig() + "/zygrib.ini"); -- Settings::checkAndCopyDefaultIni(GLOB_SettingsFilename_POI, QDir::current().absolutePath() + "/" + Util::pathConfig() + "/zygrib_poi.ini"); -+ //Settings::checkAndCopyDefaultIni(GLOB_SettingsFilename, QDir::current().absolutePath() + "/" + Util::pathConfig() + "/zygrib.ini"); -+ //Settings::checkAndCopyDefaultIni(GLOB_SettingsFilename_POI, QDir::current().absolutePath() + "/" + Util::pathConfig() + "/zygrib_poi.ini"); - - GLOB_IniSettings = new QSettings (GLOB_SettingsFilename, QSettings::IniFormat); - GLOB_IniSettings_POI = new QSettings (GLOB_SettingsFilename_POI, QSettings::IniFormat); diff --git a/zyGrib.INSTALL b/zyGrib.INSTALL deleted file mode 100644 index f083b3c..0000000 --- a/zyGrib.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -Please run qmake in source dir to build package -Run make install to install package -Run make uninstall to uninstall package - -Read man page for more information diff --git a/zyGrib.README b/zyGrib.README deleted file mode 100644 index d0ebba0..0000000 --- a/zyGrib.README +++ /dev/null @@ -1,9 +0,0 @@ -ZyGrib is a GRIB file viewer. It enables : - - Visualisation of meteo data from files in GRIB Format - Automatic GRIB data download - Automatic Download from IAC (fleet-code) Data - Roh or compressed GRIB Data (gzip *.gz; bzip2 *.bz2) can be used - -See doc directory for more info - diff --git a/zyGrib.desktop b/zyGrib.desktop deleted file mode 100644 index 208c318..0000000 --- a/zyGrib.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=zyGrib -GenericName=GRIB file viewer -Comment=GRIB file viewer -Exec=zyGrib -Icon=zyGrib -Terminal=false -Type=Application -StartupNotify=true -Categories=Network; - diff --git a/zyGrib.png b/zyGrib.png deleted file mode 100644 index 9d81f46..0000000 Binary files a/zyGrib.png and /dev/null differ diff --git a/zyGrib.spec b/zyGrib.spec deleted file mode 100644 index a430f47..0000000 --- a/zyGrib.spec +++ /dev/null @@ -1,127 +0,0 @@ -Name: zyGrib -Version: 6.1.4 -Release: 4%{?dist} -Summary: Visualization of meteo data from files in GRIB Format 1 -Group: Applications/Internet -License: GPLv3+ -URL: http://www.zygrib.org -## Source URL is: http://www.zygrib.org/getfile.php?file=zyGrib-3.9.8.tgz -Source0: %{name}-%{version}.tgz -Source1: %{name}.png -Source2: %{name}.README -Source3: %{name}.desktop -Source4: %{name}.INSTALL -Patch0: zyGrib-6.1.4-non_class_error.patch -# https://bugzilla.redhat.com/733855 -Patch3: zyGrib-6.1.4-installdata.patch -BuildRequires: qwt-devel -BuildRequires: bzip2-devel qt4-devel proj-devel desktop-file-utils libnova-devel -Requires: liberation-fonts-common -%description -ZyGrib is a GRIB file viewer. It enables : - -Visualization of meteo data from files in GRIB Format -Automatic GRIB data download -Automatic Download from IAC (fleet-code) Data -Roh or compressed GRIB Data (gzip *.gz; bzip2 *.bz2) can be used - -%prep -%setup -q -%patch0 -p1 -rm -rf src/bzip2 -rm -rf src/zlib-* -rm -rf src/proj-* -# Adding docs files -cp -pr %{SOURCE2} %{_builddir}/%{name}-%{version}/README -cp -pr %{SOURCE4} %{_builddir}/%{name}-%{version}/INSTALL -# 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 -%patch3 -p1 -b .installdata - -%build -make %{?_smp_mflags} QTBIN=%{_qt4_bindir} - -%install -rm -rf %{buildroot} -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 - - -%files -%defattr(-,root,root,-) -%doc README INSTALL -%{_bindir}/%{name} -%{_datadir}/%{name} -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/%{name}.desktop - - -%changelog -* Sat Jun 07 2014 Fedora Release Engineering - 6.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 6.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 14 2013 Pavel Zhukov - 6.1.4-2 -- New release -- Fix pathes (#962172) - -* Fri Feb 15 2013 Fedora Release Engineering - 5.0.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Oct 19 2012 Rex Dieter - 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 - 5.0.6-7 -- Rebuild for new proj - -* Sun Jul 22 2012 Fedora Release Engineering - 5.0.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 5.0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 07 2011 Pavel Zhukov - 5.0.6-4 -- New release -- Fix path (#746896, #746897, #746892, #746897, #751521) - -* Sat Aug 27 2011 Pavel Zhukov - 5.0.4-2 -- Fix maps path (#733855) - -* Sun Aug 07 2011 Pavel Zhukov - 5.0.4-1 -- New release - -* Fri Aug 05 2011 Pavel Zhukov - 5.0.2-1 -- New version - -* Wed Mar 09 2011 Pavel Zhukov - 3.9.9-3 -- Remove system-wide libraries -- Add font Requires -- Replace pointless macros - -* Wed Jan 12 2011 Pavel Zhukov - 3.9.9-2 -- Replace patch to sed -- Remove clean section and BuildRoot - -* Tue Jan 11 2011 Pavel Zhukov - 3.9.9-1 -- Update to 3.9.9 - -* Tue Jan 11 2011 Pavel Zhukov - 3.9.8-2 -- Add README file, fixed spec errors -- Add desktop file - -* Fri Dec 31 2010 Pavel Zhukov - 3.9.8-1 -- Initial package