diff --git a/.gitignore b/.gitignore index 2adf923..8f1fe61 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ telepathy-idle-0.1.6.tar.gz /telepathy-idle-0.1.10.tar.gz /telepathy-idle-0.1.11.tar.gz /telepathy-idle-0.1.12.tar.gz +/telepathy-idle-0.1.13.tar.gz diff --git a/make-j-fix.patch b/make-j-fix.patch deleted file mode 100644 index 6560078..0000000 --- a/make-j-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- telepathy-idle-0.1.12/extensions/Makefile.am.make-j-fix 2012-08-24 11:37:28.202845677 -0400 -+++ telepathy-idle-0.1.12/extensions/Makefile.am 2012-08-24 11:42:42.951842517 -0400 -@@ -42,7 +42,10 @@ - $(tools_dir)/doc-generator.xsl \ - $< > $@ - --_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \ -+_gen/svc.h: _gen/svc.c -+_gen/svc-gtk-doc.h: _gen/svc.c -+ -+_gen/svc.c: _gen/all.xml \ - $(tools_dir)/glib-ginterface-gen.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc --signal-marshal-prefix=_idle_ext \ ---- telepathy-idle-0.1.12/extensions/Makefile.in.make-j-fix 2012-08-24 11:37:31.859845553 -0400 -+++ telepathy-idle-0.1.12/extensions/Makefile.in 2012-08-24 11:43:12.430842231 -0400 -@@ -590,7 +590,10 @@ - $(tools_dir)/doc-generator.xsl \ - $< > $@ - --_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \ -+_gen/svc.h: _gen/svc.c -+_gen/svc-gtk-doc.h: _gen/svc.c -+ -+_gen/svc.c: _gen/all.xml \ - $(tools_dir)/glib-ginterface-gen.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc --signal-marshal-prefix=_idle_ext \ diff --git a/sources b/sources index b659631..d001398 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e77e5b84cc8f77cf12d15727c30df366 telepathy-idle-0.1.12.tar.gz +a82a6f15bf12e21285e6a36256c2bde0 telepathy-idle-0.1.13.tar.gz diff --git a/telepathy-idle.spec b/telepathy-idle.spec index f3c8a66..4421ccc 100644 --- a/telepathy-idle.spec +++ b/telepathy-idle.spec @@ -5,15 +5,14 @@ %endif Name: telepathy-idle -Version: 0.1.12 -Release: 2%{?dist} +Version: 0.1.13 +Release: 1%{?dist} Summary: IRC connection manager for Telepathy Group: Applications/Communications License: LGPLv2+ URL: http://telepathy.freedesktop.org/wiki/FrontPage Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz -Patch0: make-j-fix.patch BuildRequires: dbus-devel BuildRequires: dbus-glib-devel @@ -37,13 +36,14 @@ A full-featured IRC connection manager for the Telepathy project. %prep %setup -q -%patch0 -p1 -b .make-j-fix + %if %{run_tests} %check #make check %endif + %build %configure make %{?_smp_mflags} @@ -64,6 +64,10 @@ make install DESTDIR=$RPM_BUILD_ROOT %changelog +* Wed Nov 14 2012 Brian Pepple - 0.1.13-1 +- Update to 0.1.13. +- Drop make-j patch. Fixed upstream. + * Tue Oct 2 2012 Dan Winship - 0.1.12-2 - Add a patch from upstream for "make -j" reliability