diff --git a/.gitignore b/.gitignore index a4559fa..79ef148 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libnice-0.0.12.tar.gz libnice-0.0.13.tar.gz /libnice-0.1.0.tar.gz +/libnice-0.1.1.tar.gz diff --git a/0001-Fix-check-symbols-test-for-PPC64.patch b/0001-Fix-check-symbols-test-for-PPC64.patch deleted file mode 100644 index 5e95e3f..0000000 --- a/0001-Fix-check-symbols-test-for-PPC64.patch +++ /dev/null @@ -1,69 +0,0 @@ -From c266ec7eac8730031e3297d144ada9654274fe47 Mon Sep 17 00:00:00 2001 -From: David Woodhouse -Date: Mon, 15 Aug 2011 15:30:36 -0400 -Subject: [PATCH] Fix check-symbols test for PPC64 - ---- - nice/Makefile.am | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/nice/Makefile.am b/nice/Makefile.am -index ce7f316..e3438f0 100644 ---- a/nice/Makefile.am -+++ b/nice/Makefile.am -@@ -37,11 +37,18 @@ AM_CFLAGS = \ - test-symbols.sh:: - chmod +x $(srcdir)/$@ - --libnice.symbols: libnice.sym Makefile -+libnice-symbols-test.c: libnice.sym Makefile - rm -f $@ -- while read s; do echo "T $$s"; done < $< > $@ -+ while read s; do echo "void $$s(void) { }" ; done < $< > $@ - --CLEANFILES += libnice.symbols -+libnice-symbols-test.o: libnice-symbols-test.c -+ $(CC) $(CFLAGS) -c -o $@ $< -+ -+libnice.symbols: libnice-symbols-test.o Makefile -+ rm -f $@ -+ $(top_srcdir)/scripts/make-symbol-list.sh $< >$@ -+ -+CLEANFILES += libnice.symbols libnice-symbols-test.c libnice-symbols-test.o - - check_SCRIPTS = test-symbols.sh - check_DATA = libnice.symbols --- -1.7.6 - ---- libnice-0.1.0/nice/Makefile.in 2011-08-15 18:11:15.448626132 -0600 -+++ libnice-0.1.0-ppc64/nice/Makefile.in 2011-08-15 18:10:46.301065468 -0600 -@@ -271,7 +271,8 @@ ERROR_CFLAGS = \ - -Wno-missing-field-initializers - - # -Wold-style-definition -Winline -Wunreachable-code --CLEANFILES = *.gcno *.gcda libnice.symbols -+CLEANFILES = *.gcno *.gcda libnice.symbols libnice-symbols-test.c \ -+ libnice-symbols-test.o - lib_LTLIBRARIES = libnice.la - libnice_la_SOURCES = - libnice_la_DEPENDENCIES = \ -@@ -730,9 +731,16 @@ check-valgrind: - test-symbols.sh:: - chmod +x $(srcdir)/$@ - --libnice.symbols: libnice.sym Makefile -+libnice-symbols-test.c: libnice.sym Makefile - rm -f $@ -- while read s; do echo "T $$s"; done < $< > $@ -+ while read s; do echo "void $$s(void) { }" ; done < $< > $@ -+ -+libnice-symbols-test.o: libnice-symbols-test.c -+ $(CC) $(CFLAGS) -c -o $@ $< -+ -+libnice.symbols: libnice-symbols-test.o Makefile -+ rm -f $@ -+ $(top_srcdir)/scripts/make-symbol-list.sh $< >$@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libnice.spec b/libnice.spec index 528aa2c..7b3fc8c 100644 --- a/libnice.spec +++ b/libnice.spec @@ -1,13 +1,12 @@ Name: libnice -Version: 0.1.0 -Release: 5%{?dist} +Version: 0.1.11 +Release: 1%{?dist} Summary: GLib ICE implementation Group: System Environment/Libraries License: LGPLv2 and MPLv1.1 URL: http://nice.freedesktop.org/wiki/ Source0: http://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz -Patch1: 0001-Fix-check-symbols-test-for-PPC64.patch BuildRequires: glib2-devel BuildRequires: gstreamer-devel @@ -39,7 +38,6 @@ developing applications that use %{name}. %prep %setup -q -%patch1 -p1 %check @@ -83,6 +81,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Dec 7 2011 Brian Pepple - 0.1.11-1 +- Update to 0.1.1. +- Drop ppc64 patch. Fixed upstream. + * Tue Aug 16 2011 David Woodhouse - 0.1.0-5 - Apply portability patch to nice/Makefile.in too. I hate autocrap. diff --git a/sources b/sources index a72ef93..193d363 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c077e2aa74c9afb4b4e157efc8a6ad9d libnice-0.1.0.tar.gz +0906c3523eb78cb3caad170cc75af4b0 libnice-0.1.1.tar.gz