rpms/wmweather+/F-11 wmweather+-Makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wmweather+.spec, 1.10, 1.11 wmweather+-configure.patch, 1.1, NONE

[Andreas Bierfert]

Author: awjb

Update of /cvs/pkgs/rpms/wmweather+/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16669/F-11

Modified Files:
	.cvsignore sources wmweather+.spec 
Added Files:
	wmweather+-Makefile.patch 
Removed Files:
	wmweather+-configure.patch 
Log Message:
- fix FTBFS
- version upgrade


wmweather+-Makefile.patch:
 Makefile.am      |    2 +-
 Makefile.in      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE wmweather+-Makefile.patch ---
--- Makefile.in.orig	2010-03-27 15:18:52.000000000 -0500
+++ Makefile.in     	2010-03-27 15:16:07.000000000 -0500
@@ -202,7 +202,7 @@ 
         subst.h sunzenith.c sunzenith.h warnings.c warnings.h wmweather+.c \
         wmweather+.h characters.xpm wmweather_master.xpm
 
-wmweather__LDADD = wmgeneral/libwmgeneral.a wmgeneral/libwmgeneral-x11.a b0rken/libb0rken.a @XLIBS@
+wmweather__LDADD = wmgeneral/libwmgeneral.a wmgeneral/libwmgeneral-x11.a b0rken/libb0rken.a @XLIBS@ -lm
 man_MANS = wmweather+.1
 EXTRA_DIST = HINTS bootstrap example.conf $(man_MANS)
 all: config.h
--- Makefile.am.orig	2010-03-27 15:14:08.000000000 -0500
+++ Makefile.am     	2010-03-27 15:13:48.000000000 -0500
@@ -11,7 +11,7 @@ 
         metar.c metar.h moon.c moon.h mrf.c mrf.h radar.c radar.h subst.c \
         subst.h sunzenith.c sunzenith.h warnings.c warnings.h wmweather+.c \
         wmweather+.h characters.xpm wmweather_master.xpm
-wmweather__LDADD = wmgeneral/libwmgeneral.a wmgeneral/libwmgeneral-x11.a b0rken/libb0rken.a @XLIBS@
+wmweather__LDADD = wmgeneral/libwmgeneral.a wmgeneral/libwmgeneral-x11.a b0rken/libb0rken.a @XLIBS@ -lm
 
 man_MANS = wmweather+.1
 EXTRA_DIST = HINTS bootstrap example.conf $(man_MANS)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wmweather+/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 13:42:11 -0000	1.2
+++ .cvsignore	28 Mar 2010 16:26:14 -0000	1.3
@@ -1 +1 @@
-wmweather+-2.9.tar.gz
+wmweather+-2.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wmweather+/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Sep 2005 13:42:11 -0000	1.2
+++ sources	28 Mar 2010 16:26:14 -0000	1.3
@@ -1 +1 @@
-ede58d7ed589d5c41b9b68a2703a8f7d  wmweather+-2.9.tar.gz
+6b199330fa40d11ab2a1652b961e0ea0  wmweather+-2.11.tar.gz


Index: wmweather+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wmweather+/F-11/wmweather+.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- wmweather+.spec	25 Feb 2009 18:57:01 -0000	1.10
+++ wmweather+.spec	28 Mar 2010 16:26:14 -0000	1.11
@@ -1,13 +1,13 @@
 Name:           wmweather+
-Version:        2.9
-Release:        10%{?dist}
+Version:        2.11
+Release:        1%{?dist}
 Summary:        Weather status dockapp
 
 Group:          User Interface/X
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/wmweatherplus/
-Source0:        http://dl.sf.net/wmweatherplus/wmweather+-2.9.tar.gz
-Patch0:         wmweather+-configure.patch
+Source0:        http://dl.sf.net/wmweatherplus/wmweather+-2.11.tar.gz
+Patch1:         wmweather+-Makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libICE-devel
@@ -28,13 +28,12 @@ sky condition display.
 
 %prep
 %setup -q
-%patch0
+%patch1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -51,6 +50,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 28 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.11-1
+- fix FTBFS #564623
+- version upgrade
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.9-12
+- rebuilt with new openssl
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- wmweather+-configure.patch DELETED ---