diff --git a/.cvsignore b/.cvsignore index 03affd5..5de5838 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wmweather+-2.9.tar.gz +wmweather+-2.11.tar.gz diff --git a/sources b/sources index af30bc1..df18d96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ede58d7ed589d5c41b9b68a2703a8f7d wmweather+-2.9.tar.gz +6b199330fa40d11ab2a1652b961e0ea0 wmweather+-2.11.tar.gz diff --git a/wmweather+-Makefile.patch b/wmweather+-Makefile.patch new file mode 100644 index 0000000..07150b8 --- /dev/null +++ b/wmweather+-Makefile.patch @@ -0,0 +1,22 @@ +--- 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) diff --git a/wmweather+-configure.patch b/wmweather+-configure.patch deleted file mode 100644 index 249b22f..0000000 --- a/wmweather+-configure.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- configure.orig 2005-06-03 15:15:10.000000000 +0200 -+++ configure 2005-06-03 15:23:34.000000000 +0200 -@@ -3067,124 +3067,9 @@ - - # Checks for libraries. - --# --# Handle user hints --# -- echo "$as_me:$LINENO: checking if libpcre is wanted" >&5 --echo $ECHO_N "checking if libpcre is wanted... $ECHO_C" >&6 -- --# Check whether --with-libpcre or --without-libpcre was given. --if test "${with_libpcre+set}" = set; then -- withval="$with_libpcre" -- if test "$withval" != no ; then -- LIBPCRE_HOME="$withval" -- echo "$as_me:$LINENO: result: yes: libraries ${LIBPCRE_HOME}/lib includes ${LIBPCRE_HOME}/include" >&5 --echo "${ECHO_T}yes: libraries ${LIBPCRE_HOME}/lib includes ${LIBPCRE_HOME}/include" >&6 -- else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- fi --else -- LIBPCRE_HOME=/usr/local -- if test ! -f "${LIBPCRE_HOME}/include/pcre.h" -- then -- LIBPCRE_HOME=/usr -- fi -- echo "$as_me:$LINENO: result: yes: libraries ${LIBPCRE_HOME}/lib includes ${LIBPCRE_HOME}/include" >&5 --echo "${ECHO_T}yes: libraries ${LIBPCRE_HOME}/lib includes ${LIBPCRE_HOME}/include" >&6 -- --fi; -- --# --# Locate libpcre, if wanted --# -- if test -n "${LIBPCRE_HOME}" -- then -- LDFLAGS="$LDFLAGS -L${LIBPCRE_HOME}/lib" -- CPPFLAGS="$CPPFLAGS -I${LIBPCRE_HOME}/include" -- --echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5 --echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 --if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lpcre $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char pcre_compile (); --int --main () --{ --pcre_compile (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_pcre_pcre_compile=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_pcre_pcre_compile=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5 --echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 --if test $ac_cv_lib_pcre_pcre_compile = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBPCRE 1 --_ACEOF -- -- LIBS="-lpcre $LIBS" -- --else -- { { echo "$as_me:$LINENO: error: libpcre is required" >&5 --echo "$as_me: error: libpcre is required" >&2;} -- { (exit 1); exit 1; }; } --fi -- -- else -- { { echo "$as_me:$LINENO: error: libpcre is required" >&5 --echo "$as_me: error: libpcre is required" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -+LDFLAGS="$LDFLAGS -L$/usr/lib" -+CPPFLAGS="$CPPFLAGS `pcre-config --cflags`" -+LIBS="-lpcre $LIBS" - - # Check whether --with-libwww-prefix or --without-libwww-prefix was given. - if test "${with_libwww_prefix+set}" = set; then diff --git a/wmweather+.spec b/wmweather+.spec index 1a7dba6..a5951b1 100644 --- a/wmweather+.spec +++ b/wmweather+.spec @@ -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 +- 2.11-1 +- fix FTBFS #564623 +- version upgrade + +* Fri Aug 21 2009 Tomas Mraz - 2.9-12 +- rebuilt with new openssl + +* Mon Jul 27 2009 Fedora Release Engineering - 2.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 2.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild