diff --git a/.gitignore b/.gitignore index 2c65614..7342482 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xneur-0.12.0-svn859.tar.bz2 /xneur-0.13.0.tar.bz2 /xneur-0.15.0.tar.bz2 +/xneur-0.16.0.tar.bz2 diff --git a/sources b/sources index d2c4915..a107f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c70edf440b6e3366c24868c0d02734f4 xneur-0.15.0.tar.bz2 +8c375615f40bca329a37399bdf723b99 xneur-0.16.0.tar.bz2 diff --git a/xneur.spec b/xneur.spec index ca434fd..5873db0 100644 --- a/xneur.spec +++ b/xneur.spec @@ -1,13 +1,18 @@ -#% global SVN 859 +#% global HGrev 1032 Summary: X Neural Switcher Name: xneur -Version: 0.15.0 -Release: 6%{?SVN:.svn%{SVN}}%{?dist} +Version: 0.16.0 +Release: 1%{?HGrev:.hg%{HGrev}}%{?dist} License: GPLv2+ Group: User Interface/Desktops URL: http://www.xneur.ru -Source: http://dists.xneur.ru/release-%{version}/tgz/%{name}-%{version}%{?SVN:-svn%{SVN}}.tar.bz2 +%if 0%{?HGrev} +# Sources now in mercurial. Tarball from author to fix last deprecated error. +Source: xneur_%{version}+hg%{HGrev}.orig.tar.gz +%else +Source: http://dists.xneur.ru/release-%{version}/tgz/%{name}-%{version}.tar.bz2 +%endif # It is needed fo build to EL-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +28,7 @@ BuildRequires: gettext-devel, libnotify-devel >= 0.4.0, gtk2-devel # I dont understand for what icons appeared for daemon, but its there from 0.13 version Requires: hicolor-icon-theme -%if 0%{?SVN} +%if 0%{?HGrev} BuildRequires: libtool %endif @@ -59,9 +64,9 @@ developing applications that use %{name}. %build -%if 0%{?SVN} -./autogen.sh -%endif +#? % if 0%{?HGrev} +#?./autogen.sh +#?%endif # Extra parameters needs to build on Fedora > 13. See https://bugzilla.gnome.org/show_bug.cgi?id=622550 %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 )" \ @@ -70,7 +75,7 @@ developing applications that use %{name}. %endif # Hack disable -Werror to do not thread deprecated as error and allow build in rawhide: -sed -i 's#-Werror ##g' lib/main/Makefile +#?? sed -i 's#-Werror ##g' lib/main/Makefile 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 @@ -122,6 +127,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Nov 11 2012 Pavel Alexeev - 0.16.0-1 +- New 0.16.0 version. +- Sources migrated from subversion to mercurial. + * Sun Jul 22 2012 Fedora Release Engineering - 0.15.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild