- added opt patch (removed unwanted CFLAGS manipulation, incl. "-gdwarf4" to "dwarf4...

- release 2

diff --git a/flac-opt.patch b/flac-opt.patch
new file mode 100644 (file)
index 0000000..73a7e68
--- /dev/null
+++ b/flac-opt.patch
@@ -0,0 +1,16 @@
+--- flac-1.3.1/configure.ac.orig       2014-11-27 03:45:33.598155763 +0100
++++ flac-1.3.1/configure.ac    2014-11-29 09:01:11.196400208 +0100
+@@ -348,12 +348,9 @@
+ 
+ if test "x$debug" = xtrue; then
+       CPPFLAGS="-DDEBUG $CPPFLAGS"
+-      CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
+-      CFLAGS="-g $CFLAGS"
+ else
+       CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-      CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+-      CFLAGS="-O3 -funroll-loops $CFLAGS"
++      CFLAGS="$CFLAGS -O3 -funroll-loops"
+ fi
+ 
+ XIPH_GCC_VERSION

diff --git a/flac.spec b/flac.spec
index dfb6eefadb5d3219080cab7e325a24e15a7fb1a1..3e8c8b6047b5a03609ce797f2b42107fb9bba7e2 100644 (file)
--- a/flac.spec
+++ b/flac.spec
@@ -7,11 +7,12 @@ Summary:      Free Lossless Audio Codec
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
 Version:       1.3.1
 Summary(pl.UTF-8):     Free Lossless Audio Codec - Wolnodostępny bezstratny kodek audio
 Name:          flac
 Version:       1.3.1

-Release:       1
+Release:       2

 License:       BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:         Libraries
 Source0:       http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
 # Source0-md5: b9922c9a0378c88d3e901b234f852698
 License:       BSD (libFLAC/libFLAC++), GPL v2+ (programs and plugins)
 Group:         Libraries
 Source0:       http://downloads.xiph.org/releases/flac/%{name}-%{version}.tar.xz
 # Source0-md5: b9922c9a0378c88d3e901b234f852698

+Patch0:                %{name}-opt.patch

 URL:           http://xiph.org/flac/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.11
 URL:           http://xiph.org/flac/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.11


@@ -40,8 +41,6 @@ License:      BSD
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libogg-devel >= 2:1.0
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libogg-devel >= 2:1.0

-# for -c++ only
-#Requires:     libstdc++-devel

 
 %description devel
 The package contains the development header files for FLAC libraries.
 
 %description devel
 The package contains the development header files for FLAC libraries.


@@ -80,6 +79,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki FLAC++
 Group:         Development/Libraries
 Requires:      %{name}-c++ = %{version}-%{release}
 Requires:      %{name}-devel = %{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name}-c++ = %{version}-%{release}
 Requires:      %{name}-devel = %{version}-%{release}

+Requires:      libstdc++-devel

 
 %description c++-devel
 Header files for FLAC++ library.
 
 %description c++-devel
 Header files for FLAC++ library.