From c6b80a596dbb0fdcb920fe51c0a422d3a4d0f1e9 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 07:38:21 +0000 Subject: auto-import changelog data from libogg-1.0-4.src.rpm Wed Jan 22 2003 Tim Powers - rebuilt 1.0-3 - fix ogg.m4 1.0-2 - remove unpackaged files from the buildroot --- diff --git a/libogg-1.0-m4.patch b/libogg-1.0-m4.patch new file mode 100644 index 0000000..2333b71 --- /dev/null +++ b/libogg-1.0-m4.patch @@ -0,0 +1,20 @@ +--- libogg-1.0/ogg.m4.ook Wed Dec 11 17:15:08 2002 ++++ libogg-1.0/ogg.m4 Wed Dec 11 17:15:39 2002 +@@ -19,7 +19,7 @@ + elif test "x$ogg_prefix" != "x" ; then + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE" ; then +- OGG_LIBS="-L$prefix/lib" ++ OGG_LIBS="-L$libdir" + fi + + OGG_LIBS="$OGG_LIBS -logg" +@@ -29,7 +29,7 @@ + elif test "x$ogg_prefix" != "x" ; then + OGG_CFLAGS="-I$ogg_prefix/include" + elif test "$prefix" != "xNONE"; then +- OGG_CFLAGS="-I$prefix/include" ++ OGG_CFLAGS="" + fi + + AC_MSG_CHECKING(for Ogg) diff --git a/libogg.spec b/libogg.spec index 15df4a5..2821edf 100644 --- a/libogg.spec +++ b/libogg.spec @@ -1,12 +1,13 @@ Summary: The Ogg bitstream file format library. Name: libogg Version: 1.0 -Release: 1 +Release: 4 Serial: 2 Group: System Environment/Libraries Copyright: BSD URL: http://www.xiph.org/ Source: http://www.xiph.org/pub/ogg/vorbis/download/libogg-%{version}.tar.gz +Patch: libogg-1.0-m4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -26,6 +27,7 @@ needed for development using libogg. %prep %setup -q -n %{name}-%{version} +%patch -p1 %build perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure @@ -37,6 +39,9 @@ make [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +# remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + %files %defattr(-,root,root) %doc AUTHORS CHANGES COPYING README @@ -67,6 +72,15 @@ make DESTDIR=$RPM_BUILD_ROOT install %postun -p /sbin/ldconfig %changelog +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Bill Nottingham 2:1.0-3 +- fix ogg.m4 + +* Fri Nov 29 2002 Tim Powers 2:1.0-2 +- remove unpackaged files from the buildroot + * Fri Jul 18 2002 Bill Nottingham 1.0-1 - one-dot-oh