packages: mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec, mozilla...

[witekfl]

Author: witekfl                      Date: Fri Apr 29 12:58:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.14.3
- please rename it on the CVS side to browser-plugin-mozplugger

---- Files affected:
packages/mozilla-plugin-mozplugger:
   mozilla-plugin-mozplugger.spec (1.18 -> 1.19) , DESTDIR.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec
diff -u packages/mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec:1.18 packages/mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec:1.19
--- packages/mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec:1.18	Tue Feb 13 08:16:48 2007
+++ packages/mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec	Fri Apr 29 14:58:12 2011
@@ -3,17 +3,16 @@
 Summary(pl.UTF-8):	Wtyczka Mozilli do multimediów
 Summary(pt_BR.UTF-8):	Plugin para o Netscape para streaming
 Name:		mozilla-plugin-mozplugger
-Version:	1.7.3
+Version:	1.14.3
 Release:	1
 License:	GPL
 Group:		X11/Applications/Multimedia
 Source0:	http://mozplugger.mozdev.org/files/mozplugger-%{version}.tar.gz
-# Source0-md5:	5b56c7c598e9609d9dca3d7c3a88e124
+# Source0-md5:	ac2f916ac93c3b59dec2ebfc511d00a0
+Patch0:		DESTDIR.patch
 URL:		http://mozplugger.mozdev.org/
-BuildRequires:	XFree86-devel
-BuildRequires:	mozilla-embedded-devel
+BuildRequires:	xulrunner-devel
 Requires:	m4
-Requires:	mozilla-embedded
 Obsoletes:	mozilla-plugin-plugger
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,40 +34,37 @@
 
 %prep
 %setup -q -n mozplugger-%{version}
-bunzip2 mozplugger.7.bz2
+%patch0 -p1
 
 %build
-CF="%{rpmcflags} -fpic -I%{_includedir}/mozilla"
-CF="$CF -I%{_includedir}/mozilla/java -I/usr/include/nspr -I%{_includedir}/mozilla/plugin"
-%{__make} all \
-        XCFLAGS="$CF" NORM_CFLAGS="$CF" \
-        XLDFLAGS=-shared \
-	LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}" \
-        CC="%{__cc}" LD="%{__cc}" \
-        SDK=. X11=%{_prefix}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/mozilla/plugins,%{_bindir}} \
-	$RPM_BUILD_ROOT{%{_mandir}/man7,%{_sysconfdir}}
-install *.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
-install mozpluggerrc $RPM_BUILD_ROOT%{_sysconfdir}
-install mozplugger-controller $RPM_BUILD_ROOT%{_bindir}
-install mozplugger-helper $RPM_BUILD_ROOT%{_bindir}
-install mozplugger.7 $RPM_BUILD_ROOT%{_mandir}/man7
-ln -sf mozpluggerrc $RPM_BUILD_ROOT%{_sysconfdir}/mozpluggerrc-%{version}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	PLUGINDIRS=%{_browserpluginsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_browser_plugins
+
+%postun
+if [ "$1" = "0" ]; then
+	%update_browser_plugins
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/mozilla/plugins/*.so
+%attr(755,root,root) %{_browserpluginsdir}/*.so
 %{_mandir}/*/*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mozpluggerrc
-%{_sysconfdir}/mozpluggerrc-*
+%{_sysconfdir}/mozpluggerrc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -76,6 +72,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/04/29 12:58:12  witekfl
+- 1.14.3
+- please rename it on the CVS side to browser-plugin-mozplugger
+
 Revision 1.18  2007/02/13 07:16:48  glen
 - tabs in preamble
 

================================================================
Index: packages/mozilla-plugin-mozplugger/DESTDIR.patch
diff -u /dev/null packages/mozilla-plugin-mozplugger/DESTDIR.patch:1.1
--- /dev/null	Fri Apr 29 14:58:18 2011
+++ packages/mozilla-plugin-mozplugger/DESTDIR.patch	Fri Apr 29 14:58:12 2011
@@ -0,0 +1,30 @@
+--- mozplugger-1.14.3/Makefile.in.old	2011-04-29 14:23:26.000000000 +0200
++++ mozplugger-1.14.3/Makefile.in	2011-04-29 14:26:56.000000000 +0200
+@@ -152,17 +152,17 @@ 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
++	-@$(MKDIR) $(DESTDIR)@bindir@
++	-@$(MKDIR) $(DESTDIR)${PLUGINDIRS}
++	-@$(MKDIR) $(DESTDIR)@mandir@/man7
++	-@$(MKDIR) $(DESTDIR)@sysconfdir@
++	cp mozplugger-helper     $(DESTDIR)@bindir@
++	cp mozplugger-controller $(DESTDIR)@bindir@
++	cp mozplugger-linker     $(DESTDIR)@bindir@
++	for target in ${PLUGINDIRS}; do cp mozplugger.so $(DESTDIR)$${target}; done
+ #	cp mozplugger.so $(prefix)$(libprefix)/mozilla/plugins/
+-	cp $(srcdir)/mozpluggerrc  @sysconfdir@
+-	cp $(srcdir)/mozplugger.7  @mandir@/man7/
++	cp $(srcdir)/mozpluggerrc  $(DESTDIR)@sysconfdir@
++	cp $(srcdir)/mozplugger.7  $(DESTDIR)@mandir@/man7/
+ 
+ mozplugger.tar.gz: $(SOURCE_FILES)
+ 	@( DIR=`pwd`;\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-plugin-mozplugger/mozilla-plugin-mozplugger.spec?r1=1.18&r2=1.19&f=u