diff --git a/.gitignore b/.gitignore index bdc5249..b9dccbf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xneur-0.10.0_libnotify_gt_0.7.patch /xneur-0.11.1.tar.bz2 /xneur-0.12.0.tar.bz2 +/xneur-0.12.0-svn859.tar.bz2 diff --git a/sources b/sources index d8860b0..391d8e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 746b49f6aa5728deb91073cd3911e4d1 xneur-0.10.0_libnotify_gt_0.7.patch -d0ab3fac343914dd6a014d23e8c7d1db xneur-0.12.0.tar.bz2 +f7ed6aaca101df4b9d9108f1733a6e86 xneur-0.12.0-svn859.tar.bz2 diff --git a/xneur.spec b/xneur.spec index 6dfd29d..d703690 100644 --- a/xneur.spec +++ b/xneur.spec @@ -1,9 +1,9 @@ -#% global SVN 844 +%global SVN 859 Summary: X Neural Switcher Name: xneur Version: 0.12.0 -Release: 1%{?SVN:.svn%{SVN}}%{?dist} +Release: 2%{?SVN:.svn%{SVN}}%{?dist} License: GPLv2+ Group: User Interface/Desktops @@ -18,6 +18,10 @@ BuildRequires: libX11-devel, gstreamer-devel, freealut-devel >= 1.0.1 BuildRequires: enchant-devel, libXpm-devel, imlib2-devel, xosd-devel BuildRequires: gettext-devel, libnotify-devel >= 0.4.0, gtk2-devel +%if 0%{SVN} +BuildRequires: libtool +%endif + # El5 http://fedoraproject.org/wiki/EPEL/GuidelinesAndPolicies#Distribution_specific_guidelines Requires: pkgconfig @@ -55,8 +59,12 @@ developing applications that use %{name}. %patch0 -b .libnotify-0.7 -p1 %build +%if 0%{SVN} +./autogen.sh +%endif + # Extra parameters needs to build on Fedora > 13. See https://bugzilla.gnome.org/show_bug.cgi?id=622550 -%configure LIBNOTIFY_CFLAGS="%( pkg-config --cflags "libnotify >= 0.4.0" gtk+-2.0 )" LIBNOTIFY_LIBS="%( pkg-config --libs "libnotify >= 0.4.0" gtk+-2.0 )" +%configure CFLAGS="%{optflags}" LIBNOTIFY_CFLAGS="%( pkg-config --cflags "libnotify >= 0.4.0" gtk+-2.0 )" LIBNOTIFY_LIBS="%( pkg-config --libs "libnotify >= 0.4.0" gtk+-2.0 )" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -106,8 +114,14 @@ rm -rf %{buildroot} %changelog +* Fri Feb 4 2011 Pavel Alexeev - 0.12.0-2 +- New version 0.12.0 does not built on rawhide - http://koji.fedoraproject.org/koji/getfile?taskID=2758454&name=build.log , + ask upstream author (by email) and build fixed version. +- Add svn dependency stuff on svn build to regenerate configure script. + * Wed Feb 2 2011 Pavel Alexeev - 0.12.0-1 - New version 0.12.0 +- Add default optflags in configure. * Fri Jan 28 2011 Pavel Alexeev - 0.11.1-2.svn844 - Build postrelease 0.11.1-svn844 in hope it fix Shift + Tab problem.