From 588af5b54a4dfa2c036d3f7695ac5c5fddaf8f70bc38ff196882d707359a022b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 13 Dec 2007 19:15:24 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/libogg?expand=0&rev=3

---
 libogg.changes |  7 ++++++
 libogg.spec    | 67 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/libogg.changes b/libogg.changes
index 561fad6..de14eb2 100644
--- a/libogg.changes
+++ b/libogg.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Aug 12 00:36:01 CEST 2007 - crrodriguez@suse.de
+
+- really follow the library packaging policy
+- run make check 
+- add missing glibc-devel dependency on -devel package
+
 -------------------------------------------------------------------
 Mon Apr 16 15:06:37 CEST 2007 - tiwai@suse.de
 
diff --git a/libogg.spec b/libogg.spec
index c02ba0b..f550243 100644
--- a/libogg.spec
+++ b/libogg.spec
@@ -14,10 +14,10 @@ Name:           libogg
 BuildRequires:  pkgconfig
 Summary:        Ogg Bitstream Library
 Version:        1.1.3
-Release:        43
+Release:        84
 Group:          System/Libraries
-License:        BSD License and BSD-like
-URL:            http://www.vorbis.com/
+License:        BSD 3-Clause
+Url:            http://www.vorbis.com/
 Source:         %{name}-%{version}.tar.bz2
 Patch:          configure.dif
 Patch1:         lib64.dif
@@ -29,6 +29,30 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Libogg is a library for manipulating ogg bitstreams.  It handles both
 making ogg bitstreams and getting packets from ogg bitstreams.
 
+Ogg is the native bitstream format of the libvorbis (Ogg Vorbis audio
+codec ) and the libtheora (Theora video codec)
+
+
+
+Authors:
+--------
+    Monty <monty@xiph.org>
+    Xiphophorus Company <team@xiph.org>
+
+%package -n libogg0
+Summary:        Ogg Bitstream Library
+Group:          System/Libraries
+Provides:       %{name} = %{version}
+#openSUSE 10.2
+Obsoletes:      %{name} <= 1.1.3
+
+%description -n libogg0
+Libogg is a library for manipulating ogg bitstreams.  It handles both
+making ogg bitstreams and getting packets from ogg bitstreams.
+
+Ogg is the native bitstream format of the libvorbis (Ogg Vorbis audio
+codec ) and the libtheora (Theora video codec)
+
 
 
 Authors:
@@ -37,13 +61,13 @@ Authors:
     Xiphophorus Company <team@xiph.org>
 
 %package devel
-Summary:        Include Files and Libraries mandatory for Development.
+Summary:        Include Files and Libraries mandatory for Ogg Development.
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       libogg0 = %{version} glibc-devel
 
 %description devel
 This package contains all necessary include files and libraries needed
-to develop applications that require these.
+to compile and develop applications that use libogg.
 
 
 
@@ -53,7 +77,7 @@ Authors:
     Xiphophorus Company <team@xiph.org>
 
 %prep
-%setup
+%setup -q
 %patch
 %patch2
 %patch3
@@ -62,31 +86,30 @@ if [ "%_lib" == "lib64" ]; then
 fi
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -g -fstack-protector" \
-./configure --prefix=%{_prefix} --libdir=%{_libdir} \
-	--disable-static
-make
+export CFLAGS="$RPM_OPT_FLAGS -g"
+%configure --disable-static --with-pic
+%{__make} %{?jobs:-j%jobs}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-devel install
 cp AUTHORS CHANGES COPYING README $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
 # remove uneeded files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%post
-%run_ldconfig
+%check
+%{__make} check
 
-%postun
-%run_ldconfig
+%post -n libogg0 -p /sbin/ldconfig
+
+%postun -n libogg0 -p /sbin/ldconfig
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
-%files
+%files -n libogg0
 %defattr(-,root,root)
-%{_libdir}/lib*.so.*
+%{_libdir}/lib*.so.0*
 
 %files devel
 %defattr(-,root,root)
@@ -97,6 +120,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Aug 12 2007 - crrodriguez@suse.de
+- really follow the library packaging policy
+- run make check
+- add missing glibc-devel dependency on -devel package
 * Mon Apr 16 2007 - tiwai@suse.de
 - follow library packaging policy
   * move docs to devel package