- updated to 1.3.5

- disable debug packages and pkgconfig dependency generators

diff --git a/crossmingw32-libogg.spec b/crossmingw32-libogg.spec
index 4d5db92afa7b8d7ebf2459e626d2c0fac4ba1d80..a070b632c9479f1a4a6364e7a58ceea9ce8e80fe 100644 (file)
--- a/crossmingw32-libogg.spec
+++ b/crossmingw32-libogg.spec
@@ -2,12 +2,12 @@
 Summary:       Ogg Bitstream Library - MinGW32 cross version
 Summary(pl.UTF-8):     Biblioteka obsługi strumieni bitowych Ogg - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.3.4
+Version:       1.3.5
 Release:       1
 License:       BSD
 Group:         Development/Libraries
 Source0:       https://downloads.xiph.org/releases/ogg/%{realname}-%{version}.tar.xz
-# Source0-md5: eadef24aad6e3e8379ba0d14971fd64a
+# Source0-md5: 3178c98341559657a15b185bf5d700a5
 Patch0:                %{realname}-ac_fixes.patch
 URL:           https://www.xiph.org/ogg/
 BuildRequires: autoconf >= 2.50
@@ -21,6 +21,7 @@ Requires:     crossmingw32-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
+%define                _enable_debug_packages  0
 
 %define                target                  i386-mingw32
 %define                target_platform         %{target}
@@ -30,6 +31,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
+%define                __pkgconfig_provides    %{nil}
+%define                __pkgconfig_requires    %{nil}
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 

diff --git a/libogg-ac_fixes.patch b/libogg-ac_fixes.patch
index c866e29f213bd23e8607acd42a7c315cb712d36e..7ddeaf78994f089aa027fa52ebb2b4710f9a6d09 100644 (file)
--- a/libogg-ac_fixes.patch
+++ b/libogg-ac_fixes.patch
@@ -1,11 +1,11 @@
 --- libogg-1.3.3/configure.ac.orig     2010-11-01 21:13:42.000000000 +0100
 +++ libogg-1.3.3/configure.ac  2010-11-03 21:34:19.187102452 +0100
 @@ -46,8 +46,8 @@
-         case $host in 
+         case $host in
          *-*-linux*)
                  DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
--                PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
+-                CFLAGS="-O2 -Wall -ffast-math -fsigned-char"
+-                PROFILE="-Wall -W -pg -g -O2 -ffast-math -fsigned-char"
 +                CFLAGS="$CFLAGS -Wall -ffast-math -fsigned-char"
 +                PROFILE="$CFLAGS -Wall -W -pg -g -ffast-math -fsigned-char"
                ;;
@@ -15,10 +15,29 @@
                ;;
          *)
                  DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -fsigned-char"
--                PROFILE="-O20 -g -pg -fsigned-char" 
+-                CFLAGS="-O2 -fsigned-char"
+-                PROFILE="-O2 -g -pg -fsigned-char"
 +                CFLAGS="$CFLAGS -fsigned-char"
-+                PROFILE="$CFLAGS -g -pg -fsigned-char" 
++                PROFILE="$CFLAGS -g -pg -fsigned-char"
                ;;
          esac
  fi
+--- libogg-1.2.2/ogg.m4~       2009-05-21 00:57:14.000000000 +0200
++++ libogg-1.2.2/ogg.m4        2011-07-25 12:09:42.870545070 +0200
+@@ -14,16 +14,6 @@
+ AC_ARG_WITH(ogg-includes,AC_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
+ AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
+ 
+-  if test "x$ogg_libraries" != "x" ; then
+-    OGG_LIBS="-L$ogg_libraries"
+-  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
+-    OGG_LIBS=""
+-  elif test "x$ogg_prefix" != "x" ; then
+-    OGG_LIBS="-L$ogg_prefix/lib"
+-  elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
+-  fi
+-
+   if test "x$ogg_prefix" != "xno" ; then
+     OGG_LIBS="$OGG_LIBS -logg"
+   fi