Author: glen                         Date: Wed Jan 10 14:17:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- browser-plugins v2

---- Files affected:
SPECS:
   helixplayer.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/helixplayer.spec
diff -u SPECS/helixplayer.spec:1.22 SPECS/helixplayer.spec:1.23
--- SPECS/helixplayer.spec:1.22 Sun Jul 30 21:11:41 2006
+++ SPECS/helixplayer.spec      Wed Jan 10 15:17:51 2007
@@ -1,12 +1,9 @@
 # $Revision$, $Date$
-# TODO
-# - add browser-plugin mechanism
-#
 Summary:       The Helix Player - Helix Community's open source media player 
for consumers
 Summary(pl):   Helix Player - otwarty odtwarzacz multimediów Helix Community 
dla użytkowników
 Name:          helixplayer
 Version:       1.0.6
-Release:       3
+Release:       4
 License:       RPSL or GPL v2+
 Group:         Applications/Multimedia
 #Source0Download: https://helixcommunity.org/project/showfiles.php?group_id=154
@@ -24,6 +21,7 @@
 BuildRequires: pkgconfig
 BuildRequires: python
 BuildRequires: python-modules
+BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel >= 1.1.4
 Provides:      helix-core
@@ -41,6 +39,17 @@
 Helix Player to odtwarzacz multimediów Helix Community z otwartymi
 źródłami przeznaczony dla użytkowników końcowych.
 
+%package -n browser-plugin-%{name}
+Summary:       Helix Player plugin for WWW browsers
+Group:         Applications/Multimedia
+Requires:      %{name} = %{version}-%{release}
+Requires:      browser-plugins >= 2.0
+Requires:      browser-plugins(%{_target_base_arch})
+Conflicts:     helixplayer < 1.0.6-3.1
+
+%description -n browser-plugin-%{name}
+Helix Player plugin for WWW browsers.
+
 %prep
 %setup -q -n hxplay-%{version}
 %patch0 -p1
@@ -76,15 +85,25 @@
 rm -rf $RPM_BUILD_ROOT%{_helixplayerdir}/postinst
 install player/installer/archive/temp/share/hxplay.desktop 
$RPM_BUILD_ROOT%{_desktopdir}
 install player/installer/archive/temp/share/hxplay.png 
$RPM_BUILD_ROOT%{_pixmapsdir}
-install -d $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
-ln -sf ../../%{name}/mozilla/nphelix.so 
$RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nphelix.so
-ln -sf ../../%{name}/mozilla/nphelix.xpt 
$RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nphelix.xpt
+
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/mozilla,%{_browserpluginsdir}}/nphelix.so
+mv 
$RPM_BUILD_ROOT{%{_libdir}/%{name}/mozilla,%{_browserpluginsdir}}/nphelix.xpt
+
 sed -i -e "s%#[ \t]*HELIX_LIBS[ \t]*=.*%HELIX_LIBS=%{_helixplayerdir} ; export 
HELIX_LIBS%" $RPM_BUILD_ROOT%{_helixplayerdir}/hxplay
 ln -sf %{_libdir}/%{name}/hxplay $RPM_BUILD_ROOT%{_bindir}/hxplay
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n browser-plugin-%{name}
+%update_browser_plugins
+
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+       %update_browser_plugins
+fi
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/hxplay
@@ -94,22 +113,28 @@
 %attr(755,root,root) %{_helixplayerdir}/codecs
 %attr(755,root,root) %{_helixplayerdir}/common
 %attr(755,root,root) %{_helixplayerdir}/lib
-%attr(755,root,root) %{_helixplayerdir}/mozilla
-%attr(755,root,root) %{_helixplayerdir}/plugins
+%dir %{_helixplayerdir}/plugins
+%attr(755,root,root) %{_helixplayerdir}/plugins/*.so
 %{_helixplayerdir}/share
 %{_helixplayerdir}/README
 %{_helixplayerdir}/LICENSE
-%attr(755,root,root) %{_libdir}/mozilla/plugins/nphelix.so
-%attr(755,root,root) %{_libdir}/mozilla/plugins/nphelix.xpt
 %{_desktopdir}/hxplay.desktop
 %{_pixmapsdir}/hxplay.png
 
+%files -n browser-plugin-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_browserpluginsdir}/nphelix.so
+%{_browserpluginsdir}/nphelix.xpt
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/01/10 14:17:51  glen
+- browser-plugins v2
+
 Revision 1.22  2006/07/30 19:11:41  glen
 - blah, messed it up (RealPlayer.spec/realplayer.spec needs merge)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/helixplayer.spec?r1=1.22&r2=1.23&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to