[mozplugger] - fix buildroot issue - build with optflags

Than Ngo than at fedoraproject.org
Wed Nov 9 14:47:08 UTC 2011


commit c046277bc4a2013c523da1c947528713013c16aa
Author: Than Ngo <than at redhat.com>
Date:   Wed Nov 9 15:46:37 2011 +0100

    - fix buildroot issue
    - build with optflags

 mozplugger-1.14.3-buildroot.patch |   31 +++++++++++++++++++++++++++++++
 mozplugger.spec                   |   11 +++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/mozplugger-1.14.3-buildroot.patch b/mozplugger-1.14.3-buildroot.patch
new file mode 100644
index 0000000..80c1898
--- /dev/null
+++ b/mozplugger-1.14.3-buildroot.patch
@@ -0,0 +1,31 @@
+diff -up mozplugger-1.14.3/Makefile.in.buildroot mozplugger-1.14.3/Makefile.in
+--- mozplugger-1.14.3/Makefile.in.buildroot	2011-03-03 22:40:49.000000000 +0100
++++ mozplugger-1.14.3/Makefile.in	2011-11-09 15:38:29.000000000 +0100
+@@ -152,17 +152,16 @@ localinstall_opera:
+ 	make localinstall BROWSERDIR=.opera
+ 
+ install:
+-	-@$(MKDIR) @bindir@
+-	-@$(MKDIR) $(prefix)$(libprefix)/mozilla/plugins
+-	-@$(MKDIR) @mandir@/man7
+-	-@$(MKDIR) @sysconfdir@
+-	cp mozplugger-helper     @bindir@
+-	cp mozplugger-controller @bindir@
+-	cp mozplugger-linker     @bindir@
+-	for target in ${PLUGINDIRS}; do cp mozplugger.so $${target}; done
+-#	cp mozplugger.so $(prefix)$(libprefix)/mozilla/plugins/
+-	cp $(srcdir)/mozpluggerrc  @sysconfdir@
+-	cp $(srcdir)/mozplugger.7  @mandir@/man7/
++	-@$(MKDIR) $(root)@bindir@
++	-@$(MKDIR) $(root)$(prefix)$(libprefix)/mozilla/plugins
++	-@$(MKDIR) $(root)@mandir@/man7
++	-@$(MKDIR) $(root)@sysconfdir@
++	cp mozplugger-helper     $(root)@bindir@
++	cp mozplugger-controller $(root)@bindir@
++	cp mozplugger-linker     $(root)@bindir@
++	cp mozplugger.so $(root)$(prefix)$(libprefix)/mozilla/plugins/
++	cp $(srcdir)/mozpluggerrc  $(root)@sysconfdir@
++	cp $(srcdir)/mozplugger.7  $(root)@mandir@/man7/
+ 
+ mozplugger.tar.gz: $(SOURCE_FILES)
+ 	@( DIR=`pwd`;\
diff --git a/mozplugger.spec b/mozplugger.spec
index c4f2dd3..89dd215 100644
--- a/mozplugger.spec
+++ b/mozplugger.spec
@@ -10,6 +10,9 @@ Source0: http://mozplugger.mozdev.org/files/%{name}-%{version}.tar.gz
 # fix #513470, using a wrong path for executable
 Patch1: mozplugger-1.13.3-path.patch
 
+# buildroot issue
+Patch2: mozplugger-1.14.3-buildroot.patch
+
 Requires: m4
 Requires: sox
 Requires: mozilla-filesystem
@@ -27,9 +30,12 @@ programs as plug-ins for media types on the Internet.
 %prep
 %setup -q
 %patch1 -p1 -b .path
+%patch2 -p1 -b .buildroot
 
 %build
-make linux
+export XCFLAGS="%{optflags}"
+%configure
+make
 
 %install
 rm -rf %{buildroot}
@@ -54,8 +60,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
-* Wed Oct 12 2011 Than Ngo <than at redhat.com> - 1.14.3-1
+* Wed Nov 09 2011 Than Ngo <than at redhat.com> - 1.14.3-1
 - 1.14.3
+- build with optflags
 
 * Wed Sep 29 2010 Than Ngo <than at redhat.com> - 1.14.2-1
 - 1.14.2


More information about the scm-commits mailing list