add packaging

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
index d4b86c4..b6a6854 100644 (file)
--- a/packaging/baselibs.conf
+++ b/packaging/baselibs.conf
@@ -1,3 +1 @@
-libogg0
-  obsoletes "libogg-<targettype> <= <version>"
-  provides "libogg-<targettype> = <version>"
+libogg

diff --git a/packaging/libogg.spec b/packaging/libogg.spec
index 12bc737..3aa1ca1 100644 (file)
--- a/packaging/libogg.spec
+++ b/packaging/libogg.spec
@@ -7,8 +7,6 @@ Url:            http://www.vorbis.com/
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
-Patch1:         lib64.dif
-Patch2:         m4.diff
 BuildRequires:  pkg-config
 
 %description
@@ -30,10 +28,6 @@ to compile and develop applications that use libogg.
 
 %prep
 %setup -q
-%patch2
-if [ "%{_lib}" == "lib64" ]; then
-%patch1
-fi
 
 %build
 # Fix optimization level
@@ -48,9 +42,7 @@ make check
 
 
 %install
-make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-devel install
-# remove unneeded files
-rm -f %{buildroot}%{_libdir}/*.la
+%make_install
 
 %post  -p /sbin/ldconfig
 
@@ -58,7 +50,7 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS CHANGES COPYING README
+%doc COPYING 
 %{_libdir}/libogg.so.*
 
 %files devel

diff --git a/packaging/m4.diff b/packaging/m4.diff
deleted file mode 100644 (file)
index 123555a..0000000
--- a/packaging/m4.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: ogg.m4
-===================================================================
---- ogg.m4.orig
-+++ ogg.m4
-@@ -20,7 +20,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
-     OGG_LIBS=""
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_LIBS="-L$ogg_prefix/lib"
--  elif test "x$prefix" != "xNONE" ; then
-+  elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
-     OGG_LIBS="-L$prefix/lib"
-   fi
- 
-@@ -34,7 +34,7 @@ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--
-     OGG_CFLAGS=""
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_CFLAGS="-I$ogg_prefix/include"
--  elif test "x$prefix" != "xNONE"; then
-+  elif test "x$prefix" != "xNONE" -a "x$prefix" != "x/usr"; then
-     OGG_CFLAGS="-I$prefix/include"
-   fi
- 
-@@ -62,7 +62,7 @@ dnl
- #include <string.h>
- #include <ogg/ogg.h>
- 
--int main ()
-+int main (void)
- {
-   system("touch conf.oggtest");
-   return 0;