rpms/kaffeine/devel kaffeine-0.8.6-optflags.patch, NONE, 1.1 kaffeine.spec, 1.16, 1.17

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13749

Modified Files:
	kaffeine.spec 
Added Files:
	kaffeine-0.8.6-optflags.patch 
Log Message:
* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
- Patch to apply $RPM_OPT_FLAGS when building DVB libs.


kaffeine-0.8.6-optflags.patch:

--- NEW FILE kaffeine-0.8.6-optflags.patch ---
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am~	2008-01-20 19:50:43.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.am	2008-03-20 21:39:04.000000000 +0200
@@ -8,4 +8,4 @@ libdvbapi_la_SOURCES = diseqc.c \
            dvbfe.c \
            dvbnet.c
 
-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in~	2008-01-20 19:52:20.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvbapi/Makefile.in	2008-03-20 21:39:50.000000000 +0200
@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+CFLAGS = @CFLAGS@
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
 CFLAGS_DPMS = @CFLAGS_DPMS@
 CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
 CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am~	2008-01-20 19:50:42.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.am	2008-03-20 21:39:04.000000000 +0200
@@ -18,4 +18,4 @@ libdvben50221_la_SOURCES = asn_1.c \
            en50221_session.c \
            en50221_transport.c 
 
-CFLAGS  = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in~	2008-01-20 19:52:20.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libdvben50221/Makefile.in	2008-03-20 21:40:10.000000000 +0200
@@ -98,7 +98,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+CFLAGS = @CFLAGS@
+AM_CFLAGS = -g -O2 -DLOG_LEVEL=1 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
 CFLAGS_DPMS = @CFLAGS_DPMS@
 CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
 CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am~	2008-01-20 19:50:41.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.am	2008-03-20 21:39:04.000000000 +0200
@@ -16,4 +16,4 @@ libdvbdvb_la_SOURCES = bat_section.c \
            tva_container_section.c \
            types.c
 
-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in~	2008-01-20 19:52:20.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/dvb/Makefile.in	2008-03-20 21:40:28.000000000 +0200
@@ -94,7 +94,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+CFLAGS = @CFLAGS@
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
 CFLAGS_DPMS = @CFLAGS_DPMS@
 CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
 CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am~	2008-01-20 19:50:42.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.am	2008-03-20 21:39:04.000000000 +0200
@@ -14,4 +14,4 @@ libucsi_la_LDFLAGS = ./mpeg \
 libucsi_la_LIBADD   = ./mpeg/libdvbmpeg.la \
 	./dvb/libdvbdvb.la
 
-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in~	2008-01-20 19:52:20.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/Makefile.in	2008-03-20 21:40:49.000000000 +0200
@@ -102,7 +102,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+CFLAGS = @CFLAGS@
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
 CFLAGS_DPMS = @CFLAGS_DPMS@
 CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
 CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am~	2008-01-20 19:50:42.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.am	2008-03-20 21:39:04.000000000 +0200
@@ -9,4 +9,4 @@ libdvbmpeg_la_SOURCES = cat_section.c \
            pmt_section.c \
            tsdt_section.c
 
-CFLAGS  = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
diff -up kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in
--- kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in~	2008-01-20 19:52:20.000000000 +0200
+++ kaffeine-0.8.6/kaffeine/src/input/dvb/lib/libucsi/mpeg/Makefile.in	2008-03-20 21:41:09.000000000 +0200
@@ -90,7 +90,8 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
+CFLAGS = @CFLAGS@
+AM_CFLAGS = -g -O2 -Wall -Wshadow -Wpointer-arith -Wstrict-prototypes -fPIC
 CFLAGS_DPMS = @CFLAGS_DPMS@
 CFLAGS_GSTREAMER = @CFLAGS_GSTREAMER@
 CFLAGS_OGGVORBIS = @CFLAGS_OGGVORBIS@


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kaffeine.spec	7 Mar 2008 15:02:13 -0000	1.16
+++ kaffeine.spec	20 Mar 2008 19:53:46 -0000	1.17
@@ -13,7 +13,7 @@
 #define nonfree 1
 
 Version: 0.8.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if "%{?nonfree:1}" != "1"
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -27,6 +27,7 @@
 Group:   Applications/Multimedia
 URL:     http://kaffeine.sourceforge.net/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.bz2
+Patch0:  %{name}-0.8.6-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gettext
@@ -100,7 +101,7 @@
 
 %prep
 %setup -q -n kaffeine-%{version}
-
+%patch0 -p1 -b .optflags
 %{?nonfree:%patch1 -p1 -b .codecs}
 
 
@@ -220,6 +221,9 @@
 
 
 %changelog
+* Thu Mar 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.6-4
+- Patch to apply $RPM_OPT_FLAGS when building DVB libs.
+
 * Fri Mar 07 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.6-3
 - fix deps wrt kaffeine-libs (#436442)
 - f7: xcb support (#373411)