rpms/wxsvg/F-18 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wxsvg.spec, 1.20, 1.21
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/wxsvg/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3147
Modified Files:
.cvsignore sources wxsvg.spec
Log Message:
* Mon Apr 08 2013 Sérgio Basto <sergio(a)serjux.com> - 1.1.14-1
- Update to 1.1.14
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-18/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Feb 2013 02:23:09 -0000 1.9
+++ .cvsignore 15 Apr 2013 00:10:33 -0000 1.10
@@ -1 +1 @@
-wxsvg-1.1.13.tar.bz2
+wxsvg-1.1.14.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-18/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Feb 2013 02:23:09 -0000 1.9
+++ sources 15 Apr 2013 00:10:34 -0000 1.10
@@ -1 +1 @@
-e8ab2cd0398fbc5cafff2cee43150ec5 wxsvg-1.1.13.tar.bz2
+93f44b9dfe79f9c96c972c80220bf0c8 wxsvg-1.1.14.tar.bz2
Index: wxsvg.spec
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-18/wxsvg.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wxsvg.spec 22 Feb 2013 02:23:09 -0000 1.20
+++ wxsvg.spec 15 Apr 2013 00:10:34 -0000 1.21
@@ -1,5 +1,5 @@
Name: wxsvg
-Version: 1.1.13
+Version: 1.1.14
Release: 1%{?dist}
Summary: C++ library to create, manipulate and render SVG files
@@ -8,7 +8,7 @@
URL: http://sourceforge.net/projects/wxsvg
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, gettext
+BuildRequires: libtool gettext
BuildRequires: expat-devel
BuildRequires: ffmpeg-devel
BuildRequires: freetype-devel
@@ -33,6 +33,7 @@
%setup -q
%build
+chmod +x ./autogen.sh ./configure
./autogen.sh
%configure \
--disable-dependency-tracking \
@@ -67,6 +68,9 @@
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Mon Apr 08 2013 Sérgio Basto <sergio(a)serjux.com> - 1.1.14-1
+- Update to 1.1.14
+
* Wed Feb 20 2013 Sérgio Basto <sergio(a)serjux.com> - 1.1.13-1
- Update to 1.1.13
11 years, 7 months
rpms/npapi-vlc/F-17 .cvsignore, 1.4, 1.5 npapi-vlc.spec, 1.5, 1.6 sources, 1.4, 1.5 npapi-vlc-master.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/npapi-vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17970/F-17
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/F-17/.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 11:02:24 -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/F-17/npapi-vlc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- npapi-vlc.spec 9 Mar 2012 22:38:37 -0000 1.5
+++ npapi-vlc.spec 14 Apr 2013 11:02:24 -0000 1.6
@@ -1,7 +1,8 @@
#global githash f568362
+%global _configure ../configure
Name: npapi-vlc
-Version: 2.0.0
+Version: 2.0.6
Release: 1%{?githash:git%{githash}}%{?dist}
Summary: NPAPI plugin for libvlc
@@ -9,50 +10,120 @@
License: LGPLv2+
URL: http://git.videolan.org/?p=npapi-vlc.git;a=summary
Source0: http://download.videolan.org/videolan/vlc/%{version}/npapi-vlc-%{version}...
-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(a)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(a)gmail.com> - 2.0.2-2
+- Mass rebuilt for Fedora 19 Features
+
* Fri Mar 9 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-1
- Update to 2.0.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/F-17/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 11:02:24 -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 ---
11 years, 7 months
rpms/npapi-vlc/F-18 .cvsignore, 1.4, 1.5 npapi-vlc.spec, 1.5, 1.6 sources, 1.4, 1.5 npapi-vlc-master.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/npapi-vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17970/F-18
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/F-18/.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 11:02:24 -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/F-18/npapi-vlc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- npapi-vlc.spec 9 Mar 2012 22:38:37 -0000 1.5
+++ npapi-vlc.spec 14 Apr 2013 11:02:24 -0000 1.6
@@ -1,7 +1,8 @@
#global githash f568362
+%global _configure ../configure
Name: npapi-vlc
-Version: 2.0.0
+Version: 2.0.6
Release: 1%{?githash:git%{githash}}%{?dist}
Summary: NPAPI plugin for libvlc
@@ -9,50 +10,120 @@
License: LGPLv2+
URL: http://git.videolan.org/?p=npapi-vlc.git;a=summary
Source0: http://download.videolan.org/videolan/vlc/%{version}/npapi-vlc-%{version}...
-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(a)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(a)gmail.com> - 2.0.2-2
+- Mass rebuilt for Fedora 19 Features
+
* Fri Mar 9 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-1
- Update to 2.0.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/F-18/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 11:02:24 -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 ---
11 years, 7 months
rpms/npapi-vlc/F-19 .cvsignore, 1.4, 1.5 npapi-vlc.spec, 1.6, 1.7 sources, 1.4, 1.5 npapi-vlc-master.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/npapi-vlc/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17970/F-19
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/F-19/.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 11:02:24 -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/F-19/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 11:02:24 -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}...
-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(a)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(a)gmail.com> - 2.0.2-2
- Mass rebuilt for Fedora 19 Features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/F-19/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 11:02:24 -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 ---
11 years, 7 months
rpms/npapi-vlc/EL-6 .cvsignore, 1.4, 1.5 npapi-vlc.spec, 1.5, 1.6 sources, 1.4, 1.5 npapi-vlc-master.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/npapi-vlc/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17970/EL-6
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/EL-6/.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 11:02:25 -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/EL-6/npapi-vlc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- npapi-vlc.spec 9 Mar 2012 22:38:37 -0000 1.5
+++ npapi-vlc.spec 14 Apr 2013 11:02:25 -0000 1.6
@@ -1,7 +1,8 @@
#global githash f568362
+%global _configure ../configure
Name: npapi-vlc
-Version: 2.0.0
+Version: 2.0.6
Release: 1%{?githash:git%{githash}}%{?dist}
Summary: NPAPI plugin for libvlc
@@ -9,50 +10,120 @@
License: LGPLv2+
URL: http://git.videolan.org/?p=npapi-vlc.git;a=summary
Source0: http://download.videolan.org/videolan/vlc/%{version}/npapi-vlc-%{version}...
-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(a)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(a)gmail.com> - 2.0.2-2
+- Mass rebuilt for Fedora 19 Features
+
* Fri Mar 9 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-1
- Update to 2.0.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/npapi-vlc/EL-6/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 11:02:25 -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 ---
11 years, 7 months
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
by 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}...
-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(a)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(a)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 ---
11 years, 7 months
rpms/staging-kmod/F-18 staging-kmod.spec,1.54,1.55
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27532
Modified Files:
staging-kmod.spec
Log Message:
* Sat Apr 13 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-3
- disable RTL8192E, now shipped upstream
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-18/staging-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- staging-kmod.spec 12 Apr 2013 23:08:04 -0000 1.54
+++ staging-kmod.spec 13 Apr 2013 14:36:20 -0000 1.55
@@ -1,7 +1,7 @@
# akmods not supported
# which drivers to built
-%global stgdrvs ASUS_OLED BCM_WIMAX CSR_WIFI DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB NET_VENDOR_SILICOM PRISM2_USB R8187SE RTL8192E RTL8192U RTS5139 SB105X SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZCACHE ZRAM ZSMALLOC
+%global stgdrvs ASUS_OLED BCM_WIMAX CSR_WIFI DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB NET_VENDOR_SILICOM PRISM2_USB R8187SE RTL8192U RTS5139 SB105X SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZCACHE ZRAM ZSMALLOC
# fixme: DVB_AS102 DVB_CXD2099
@@ -22,7 +22,7 @@
Name: staging-kmod
Version: 3.8.1
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.8
+Release: %{?prever:0.}3%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -52,7 +52,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; ' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; ' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -139,26 +139,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Apr 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.8
-- Rebuilt for kernel
-
-* Wed Apr 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.7
-- Rebuilt for kernel
-
-* Tue Apr 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.6
-- Rebuilt for kernel
-
-* Fri Mar 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.5
-- Rebuilt for kernel
-
-* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.4
-- Rebuilt for kernel
-
-* Fri Mar 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.3
-- Rebuilt for kernel
-
-* Sun Mar 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.8.1-2.2
-Rebuilt for kernel
+* Sat Apr 13 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-3
+- disable RTL8192E, now shipped upstream
* Sat Mar 02 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-2
- disable SBE_2T3E3 and CXT1E1, need something that is disabled in Fedora
11 years, 7 months
rpms/vice/F-18 vice-2.1-gcc44.patch,1.1,NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26274
Removed Files:
vice-2.1-gcc44.patch
Log Message:
Remove no longer used vice-2.1-gcc44.patch
--- vice-2.1-gcc44.patch DELETED ---
11 years, 7 months
rpms/vice/F-19 vice-2.1-gcc44.patch,1.1,NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26227
Removed Files:
vice-2.1-gcc44.patch
Log Message:
Remove no longer used vice-2.1-gcc44.patch
--- vice-2.1-gcc44.patch DELETED ---
11 years, 7 months
rpms/vice/devel vice-2.1-gcc44.patch,1.1,NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26150
Removed Files:
vice-2.1-gcc44.patch
Log Message:
Remove no longer used vice-2.1-gcc44.patch
--- vice-2.1-gcc44.patch DELETED ---
11 years, 7 months
