rpms/npapi-vlc/devel .cvsignore, 1.4, 1.5 npapi-vlc.spec, 1.6, 1.7 sources, 1.4, 1.5 npapi-vlc-master.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/npapi-vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15536/devel

Modified Files:
	.cvsignore npapi-vlc.spec sources 
Removed Files:
	npapi-vlc-master.patch 
Log Message:
Update to 2.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Mar 2012 22:38:37 -0000	1.4
+++ .cvsignore	14 Apr 2013 10:14:29 -0000	1.5
@@ -1 +1 @@
-npapi-vlc-2.0.0.tar.xz
+npapi-vlc-2.0.6.tar.xz


Index: npapi-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/devel/npapi-vlc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- npapi-vlc.spec	3 Mar 2013 21:45:22 -0000	1.6
+++ npapi-vlc.spec	14 Apr 2013 10:14:29 -0000	1.7
@@ -1,58 +1,126 @@
 #global githash f568362
+%global _configure ../configure
 
 Name:           npapi-vlc
-Version:        2.0.2
-Release:        2%{?githash:git%{githash}}%{?dist}
+Version:        2.0.6
+Release:        1%{?githash:git%{githash}}%{?dist}
 Summary:        NPAPI plugin for libvlc
 
 Group:          Applications/Internet
 License:        LGPLv2+
 URL:            http://git.videolan.org/?p=npapi-vlc.git;a=summary
 Source0:        http://download.videolan.org/videolan/vlc/%{version}/npapi-vlc-%{version}%{?githash}.tar.xz
-Patch0:         npapi-vlc-master.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Buildrequires:  libtool
 
 BuildRequires:  gecko-devel
 BuildRequires:  vlc-devel
+Requires:       %{name}-filesystem = %{version}-%{release}
+#For transition - to keep until next release
+Requires:       %{name}-gtk = %{version}-%{release}
 
+%description
+NPAPI plugin for libvlc.
+
+%package        filesystem
+Summary:        NPAPI plugin for libvlc - filesystem
+Group:          Applications/Internet
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+
+%description    filesystem
+NPAPI plugin for libvlc - filesystem
+
+%package        gtk
+Summary:        NPAPI plugin for libvlc - gtk version
+Group:          Applications/Internet
+Requires:       %{name}-filesystem = %{version}-%{release}
 Provides:       mozilla-vlc = %{version}-%{release}
 Obsoletes:      mozilla-vlc < 1.2.0
 
-
-%description
-NPAPI plugin for libvlc.
+%description    gtk
+NPAPI plugin for libvlc - gtk version.
 
 
 %prep
 %setup -q -n npapi-vlc-%{version}%{?githash}
-%patch0 -p1
 
 
 %build
-%configure
+mkdir -p generic gtk
+pushd generic
+%configure --disable-silent-rules --without-gtk
+
 make %{?_smp_mflags}
+popd
 
+pushd gtk
+%configure --disable-silent-rules
+
+make %{?_smp_mflags}
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/vlc/npapi
+pushd generic
+make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/libvlcplugin.so \
+ $RPM_BUILD_ROOT%{_libdir}/vlc/npapi/libvlcplugin-generic.so
+popd
+pushd gtk
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/libvlcplugin.so \
+ $RPM_BUILD_ROOT%{_libdir}/vlc/npapi/libvlcplugin-gtk.so
+popd
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+#Alternative support
+touch $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/libvlcplugin.so
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+%post
+update-alternatives \
+  --install \
+    %{_libdir}/mozilla/plugins/libvlcplugin.so \
+    libvlcplugin.so.%{_arch} \
+    %{_libdir}/vlc/npapi/libvlcplugin-generic.so \
+    10
+
+%post gtk
+update-alternatives \
+  --install \
+    %{_libdir}/mozilla/plugins/libvlcplugin.so \
+    libvlcplugin.so.%{_arch} \
+    %{_libdir}/vlc/npapi/libvlcplugin-gtk.so \
+    100 \
 
-%files
-%defattr(-,root,root,-)
+%postun
+alternatives --remove libvlcplugin.so.%{_arch} %{_libdir}/vlc/npapi/libvlcplugin-generic.so
+
+%postun gtk
+alternatives --remove libvlcplugin.so.%{_arch} %{_libdir}/vlc/npapi/libvlcplugin-gtk.so
+
+
+%files filesystem
 %doc AUTHORS ChangeLog COPYING NEWS
-%{_libdir}/mozilla/plugins/libvlcplugin.so
+%dir %{_libdir}/vlc/npapi
+
+%files
+%ghost %{_libdir}/mozilla/plugins/libvlcplugin.so
+%{_libdir}/vlc/npapi/libvlcplugin-generic.so
+
+%files gtk
+%ghost %{_libdir}/mozilla/plugins/libvlcplugin.so
+%{_libdir}/vlc/npapi/libvlcplugin-gtk.so
 
 
 
 %changelog
+* Fri Apr 12 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.6-1
+- Update to 2.0.6
+- Add alternatives support for generic build
+- Add mozilla-vlc to point to gtk sub-package
+
 * Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.0.2-2
 - Mass rebuilt for Fedora 19 Features
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Mar 2012 22:38:37 -0000	1.4
+++ sources	14 Apr 2013 10:14:29 -0000	1.5
@@ -1 +1 @@
-292d5ac4cc9472390217e56c1caa8e21  npapi-vlc-2.0.0.tar.xz
+cef645f74e85a491ab122da4e7839c8a  npapi-vlc-2.0.6.tar.xz


--- npapi-vlc-master.patch DELETED ---