rpms/flac/devel flac-1.1.2-libtool.patch, 1.1, 1.2 flac.spec, 1.10, 1.11

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Mar 28 19:07:17 UTC 2005 

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26937

Modified Files:
	flac-1.1.2-libtool.patch flac.spec 
Log Message:
- removed -read_only_relocs libtool option


flac-1.1.2-libtool.patch:
 configure                                  |    4 ++--
 src/libFLAC/Makefile.in                    |    1 -
 src/plugin_common/Makefile.in              |    2 +-
 src/share/getopt/Makefile.in               |    2 +-
 src/share/grabbag/Makefile.in              |    2 +-
 src/share/replaygain_analysis/Makefile.in  |    2 +-
 src/share/replaygain_synthesis/Makefile.in |    2 +-
 src/share/utf8/Makefile.in                 |    2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

Index: flac-1.1.2-libtool.patch
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac-1.1.2-libtool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flac-1.1.2-libtool.patch	28 Mar 2005 17:11:48 -0000	1.1
+++ flac-1.1.2-libtool.patch	28 Mar 2005 19:07:14 -0000	1.2
@@ -1,5 +1,15 @@
---- flac-1.1.2/src/share/getopt/Makefile.in.moo	2005-03-28 12:02:54.441048000 -0500
-+++ flac-1.1.2/src/share/getopt/Makefile.in	2005-03-28 12:03:23.516944000 -0500
+--- flac-1.1.2/src/libFLAC/Makefile.in.libtool	2005-03-28 14:04:17.247084000 -0500
++++ flac-1.1.2/src/libFLAC/Makefile.in	2005-03-28 14:05:04.911372000 -0500
+@@ -304,7 +304,6 @@
+ @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ia32/libFLAC-asm.la
+ @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
+ @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
+- at FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+ SUBDIRS = $(ARCH_SUBDIRS) include .
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = libFLAC.m4
+--- flac-1.1.2/src/share/getopt/Makefile.in.libtool	2005-02-04 21:23:48.000000000 -0500
++++ flac-1.1.2/src/share/getopt/Makefile.in	2005-03-28 14:02:19.629819000 -0500
 @@ -83,7 +83,7 @@
  CCAS = @CCAS@
  CCASFLAGS = @CCASFLAGS@
@@ -9,8 +19,8 @@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
---- flac-1.1.2/src/share/replaygain_analysis/Makefile.in.moo	2005-03-28 12:04:21.822579000 -0500
-+++ flac-1.1.2/src/share/replaygain_analysis/Makefile.in	2005-03-28 12:04:30.600793000 -0500
+--- flac-1.1.2/src/share/replaygain_analysis/Makefile.in.libtool	2005-02-04 21:23:49.000000000 -0500
++++ flac-1.1.2/src/share/replaygain_analysis/Makefile.in	2005-03-28 14:02:19.743705000 -0500
 @@ -81,7 +81,7 @@
  CCAS = @CCAS@
  CCASFLAGS = @CCASFLAGS@
@@ -20,8 +30,8 @@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
---- flac-1.1.2/src/share/replaygain_synthesis/Makefile.in.moo	2005-03-28 12:04:41.382999000 -0500
-+++ flac-1.1.2/src/share/replaygain_synthesis/Makefile.in	2005-03-28 12:04:52.278094000 -0500
+--- flac-1.1.2/src/share/replaygain_synthesis/Makefile.in.libtool	2005-02-04 21:23:49.000000000 -0500
++++ flac-1.1.2/src/share/replaygain_synthesis/Makefile.in	2005-03-28 14:02:19.864584000 -0500
 @@ -88,7 +88,7 @@
  CCAS = @CCAS@
  CCASFLAGS = @CCASFLAGS@
@@ -31,8 +41,8 @@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
---- flac-1.1.2/src/share/grabbag/Makefile.in.moo	2005-03-28 12:03:41.000443000 -0500
-+++ flac-1.1.2/src/share/grabbag/Makefile.in	2005-03-28 12:03:50.739693000 -0500
+--- flac-1.1.2/src/share/grabbag/Makefile.in.libtool	2005-02-04 21:23:48.000000000 -0500
++++ flac-1.1.2/src/share/grabbag/Makefile.in	2005-03-28 14:02:19.978470000 -0500
 @@ -83,7 +83,7 @@
  CCAS = @CCAS@
  CCASFLAGS = @CCASFLAGS@
@@ -42,8 +52,8 @@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
---- flac-1.1.2/src/share/utf8/Makefile.in.moo	2005-03-28 12:01:23.832747000 -0500
-+++ flac-1.1.2/src/share/utf8/Makefile.in	2005-03-28 12:01:57.632913000 -0500
+--- flac-1.1.2/src/share/utf8/Makefile.in.libtool	2005-02-04 21:23:51.000000000 -0500
++++ flac-1.1.2/src/share/utf8/Makefile.in	2005-03-28 14:02:20.090358000 -0500
 @@ -81,7 +81,7 @@
  CCAS = @CCAS@
  CCASFLAGS = @CCASFLAGS@
@@ -53,8 +63,8 @@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
---- flac-1.1.2/src/plugin_common/Makefile.in.moo	2005-03-28 12:00:14.761430000 -0500
-+++ flac-1.1.2/src/plugin_common/Makefile.in	2005-03-28 12:01:01.087515000 -0500
+--- flac-1.1.2/src/plugin_common/Makefile.in.libtool	2005-02-04 21:23:45.000000000 -0500
++++ flac-1.1.2/src/plugin_common/Makefile.in	2005-03-28 14:02:20.184264000 -0500
 @@ -101,7 +101,7 @@
  CCAS = @CCAS@
  CCASFLAGS = @CCASFLAGS@
@@ -64,8 +74,8 @@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
---- flac-1.1.2/configure.moo	2005-03-28 11:57:15.402859000 -0500
-+++ flac-1.1.2/configure	2005-03-28 11:59:26.527603000 -0500
+--- flac-1.1.2/configure.libtool	2005-02-04 21:22:32.000000000 -0500
++++ flac-1.1.2/configure	2005-03-28 14:02:20.463984000 -0500
 @@ -10541,9 +10541,9 @@
  if test x$debug = xtrue; then
  	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- flac.spec	28 Mar 2005 17:11:48 -0000	1.10
+++ flac.spec	28 Mar 2005 19:07:14 -0000	1.11
@@ -45,7 +45,7 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch1 -p1 -b .libtool
 %patch3 -p1 -b .gnu-stack
 
 %build

More information about the fedora-cvs-commits mailing list