From 822923df43116d1e186a728f33e795c4fa9ac097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 9 Aug 2010 11:32:21 +0200 Subject: [PATCH 1/2] Change RPM group --- wmfrog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wmfrog.spec b/wmfrog.spec index 643fa97..f79bb0d 100644 --- a/wmfrog.spec +++ b/wmfrog.spec @@ -1,9 +1,9 @@ Name: wmfrog Version: 0.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A weather application, it shows the weather in a graphical way -Group: User Interface/X +Group: Amusements/Graphics License: GPLv2+ URL: http://wiki.colar.net/wmfrog_dockapp Source0: http://bitbucket.org/tcolar/%{name}/downloads/%{name}-%{version}.tgz @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 09 2010 Petr Pisar - 0.2.1-2 +- Change RPM group to Amusements/Graphics + * Thu Aug 05 2010 Petr Pisar - 0.2.1-1 - 0.2.1 bump - Fix METAR parser From 5b47d42a9cd50da8614377545c007c0df92d0f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 1 Sep 2010 11:37:22 +0200 Subject: [PATCH 2/2] 0.2.2 bump Upstream solved wind parsing in other way, patch for 0.2.1 removed. --- .gitignore | 1 + sources | 2 +- wmfrog-0.2.1-metar_parser.patch | 68 --------------------------------- wmfrog.spec | 9 +++-- 4 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 wmfrog-0.2.1-metar_parser.patch diff --git a/.gitignore b/.gitignore index 3b251ed..142e567 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wmfrog-0.2.1.tgz +/wmfrog-0.2.2.tgz diff --git a/sources b/sources index a837528..d240624 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad9a552cb6b802e7eca0a05d3a53151d wmfrog-0.2.1.tgz +5732ea81317451462143bfd5ddba2b16 wmfrog-0.2.2.tgz diff --git a/wmfrog-0.2.1-metar_parser.patch b/wmfrog-0.2.1-metar_parser.patch deleted file mode 100644 index c46f838..0000000 --- a/wmfrog-0.2.1-metar_parser.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -Naur wmfrog-0.2.1/Src/weather.pl wmfrog-0.2.1-devel/Src/weather.pl ---- wmfrog-0.2.1/Src/weather.pl 2010-08-04 20:43:34.000000000 +0200 -+++ wmfrog-0.2.1-devel/Src/weather.pl 2010-08-05 13:11:51.446572041 +0200 -@@ -5,6 +5,7 @@ - #The Weather data can be retrieved through http of ftp. - #Http is faster, however this might get broken if NOAA change their webpage layout - #in wich case you should choose ftp. -+# See for more details. - $mode="http"; # html || ftp - - -@@ -16,17 +17,17 @@ - mkdir($tmpfolder); - - $html="http://weather.noaa.gov/cgi-bin/mgetmetar.pl?cccc=${station}"; --$ftp="ftp://weather.noaa.gov/data/observations/metar/stations/${station}.TXT"; -+$ftp="ftp://tgftp.nws.noaa.gov/data/observations/metar/stations/${station}.TXT"; - $url=$html; - if($mode eq "ftp") - { - $url=$ftp; - } - -+my $file="${tmpfolder}/${station}_dat"; - # change this line if wget isn't in your path: --`wget -q -O ${tmpfolder}/${station}_dat $url`; --$line=""; --$file="${tmpfolder}/${station}_dat"; -+`wget -q -O ${file} $url`; -+my $line=""; - open(DATA,"<$file"); - $allGood=0; - if($mode eq "http") -@@ -37,7 +38,7 @@ - $line=; - } - $i=0; -- while($i!=12 && !eof(DATA)) -+ while($i!=20 && !eof(DATA)) - { - #print "*"; - $line=; -@@ -53,22 +54,10 @@ - chomp $line; - ($crap,$time)=split(/\ /,$line); - ($hour,$minute)=split(/:/,$time); --$line=""; --if($mode eq "http") --{ -- $i=0; -- while($i!=8) -- { -- $line=; -- $i++; -- } --} --$newLine=; --$line.=$newLine; --chomp $line; --$line=~s/
//; --$line="METAR $station $line"; -+ -+$line=; - close DATA; -+chomp $line; - - chomp $line; - @args=split(/\ /,$line); diff --git a/wmfrog.spec b/wmfrog.spec index f79bb0d..d0c59c6 100644 --- a/wmfrog.spec +++ b/wmfrog.spec @@ -1,6 +1,6 @@ Name: wmfrog -Version: 0.2.1 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: A weather application, it shows the weather in a graphical way Group: Amusements/Graphics @@ -8,7 +8,6 @@ License: GPLv2+ URL: http://wiki.colar.net/wmfrog_dockapp Source0: http://bitbucket.org/tcolar/%{name}/downloads/%{name}-%{version}.tgz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Patch0: %{name}-0.2.1-metar_parser.patch BuildRequires: libX11-devel, libXext-devel, libXpm-devel Requires: wget @@ -21,7 +20,6 @@ when I was 25, I'm a programmer not a designer :) %prep %setup -q -c -%patch0 -p1 -b .metar_parser sed -i -e 's|/lib/wmfrog|/libexec/wmfrog|' Src/Makefile sed -i 's|/usr/lib/|%{_libexecdir}/|' Src/wmFrog.c @@ -49,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 01 2010 Petr Pisar - 0.2.2-1 +- 0.2.2 bump + * Mon Aug 09 2010 Petr Pisar - 0.2.1-2 - Change RPM group to Amusements/Graphics