rpms/VirtualBox-OSE-kmod/F-16 VirtualBox-OSE-kmod.spec,1.66,1.67
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26294
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Re-enable newest
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-16/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- VirtualBox-OSE-kmod.spec 31 Dec 2011 16:20:47 -0000 1.66
+++ VirtualBox-OSE-kmod.spec 31 Dec 2011 16:21:33 -0000 1.67
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
12 years, 12 months
rpms/VirtualBox-OSE-kmod/F-16 VirtualBox-OSE-kmod.spec,1.65,1.66
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26028
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Build for current
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-16/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- VirtualBox-OSE-kmod.spec 24 Dec 2011 13:50:26 -0000 1.65
+++ VirtualBox-OSE-kmod.spec 31 Dec 2011 16:20:47 -0000 1.66
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels akmod
+#define buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -18,7 +18,7 @@
Name: VirtualBox-OSE-kmod
Version: 4.1.8
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -100,6 +100,9 @@
%changelog
+* Sat Dec 31 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.8-1.2
+- Build for current in F-16
+
* Sat Dec 24 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-1
- New release.
12 years, 12 months
rpms/openafs-kmod/devel .cvsignore, 1.3, 1.4 openafs-kmod.spec, 1.10, 1.11 sources, 1.5, 1.6
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13515
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 7 Sep 2011 19:42:13 -0000 1.3
+++ .cvsignore 31 Dec 2011 15:02:24 -0000 1.4
@@ -1 +1,2 @@
-openafs-1.6.0-src.tar.bz2
+openafs-1.6.1pre1-src.tar.bz2
+openafs-1.6.1pre1-doc.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openafs-kmod.spec 2 Nov 2011 22:43:45 -0000 1.10
+++ openafs-kmod.spec 31 Dec 2011 15:02:24 -0000 1.11
@@ -20,8 +20,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.0
-Release: 2%{?dist}.4
+Version: 1.6.1
+Release: 0.pre1%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -94,6 +94,9 @@
%changelog
+* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+- Update to OpenAFS 1.6.1 pre-release 1
+
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.0-2.4
- Rebuild for F-16 kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 7 Sep 2011 19:42:13 -0000 1.5
+++ sources 31 Dec 2011 15:02:24 -0000 1.6
@@ -1 +1,2 @@
-ad53439fb0fbebcbcffc046835e40d54 openafs-1.6.0-src.tar.bz2
+99a79608d68a7f087a1357d2f3ad2b01 openafs-1.6.1pre1-src.tar.bz2
+be0f3db9d12603684126c56a3aa4c613 openafs-1.6.1pre1-doc.tar.bz2
12 years, 12 months
rpms/openafs/devel .cvsignore, 1.3, 1.4 openafs.spec, 1.10, 1.11 sources, 1.6, 1.7
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26497
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openafs.spec 6 Sep 2011 18:25:09 -0000 1.10
+++ openafs.spec 30 Dec 2011 23:15:11 -0000 1.11
@@ -12,8 +12,8 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.0
-Release: 1%{?dist}
+Version: 1.6.1
+Release: 0.pre1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -318,6 +318,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+- Update to OpenAFS 1.6.1 pre-release 1
+
* Fri Sep 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-1
- Update to OpenAFS 1.6.0 final
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 6 Sep 2011 18:25:09 -0000 1.6
+++ sources 30 Dec 2011 23:15:11 -0000 1.7
@@ -1,2 +1,2 @@
-41180f1adacd926dc6c8c94e947dfb60 openafs-1.6.0-doc.tar.bz2
-ad53439fb0fbebcbcffc046835e40d54 openafs-1.6.0-src.tar.bz2
+99a79608d68a7f087a1357d2f3ad2b01 openafs-1.6.1pre1-src.tar.bz2
+be0f3db9d12603684126c56a3aa4c613 openafs-1.6.1pre1-doc.tar.bz2
12 years, 12 months
rpms/xbmc/devel xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch, NONE, 1.1 xbmc.spec, 1.37, 1.38 xbmc-10-Makefile.patch, 1.1, NONE xbmc-10-bootstrap.patch, 1.1, NONE xbmc-10-dvdread.patch, 1.1, NONE xbmc-10-hdhomerun.patch, 1.2, NONE xbmc-10-python2.7.patch, 1.2, NONE xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch, 1.1, NONE xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch, 1.1, NONE xbmc-support_newer_libbluray.patch, 1.1, NONE
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12175
Modified Files:
xbmc.spec
Added Files:
xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
Removed Files:
xbmc-10-Makefile.patch xbmc-10-bootstrap.patch
xbmc-10-dvdread.patch xbmc-10-hdhomerun.patch
xbmc-10-python2.7.patch
xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch
xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch
xbmc-support_newer_libbluray.patch
Log Message:
Sync with git:
- Add additional patch from http://trac.xbmc.org/ticket/12001 to
fix uninitialised pointer with libpng 1.5
- Remove upstreamed, or otherwise obsoleted patches
xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch:
ximapng.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
--- NEW FILE xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch ---
Update libpng 1.5 patch: check return values of png_get_PLTE() and
png_get_tRNS() before using the values to avoid using uninitialized values.
--- a/lib/cximage-6.0/CxImage/ximapng.cpp
+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
@@ -178,12 +178,14 @@ bool CxImagePNG::Decode(CxFile *hFile)
int _num_palette;
png_colorp _palette;
#if PNG_LIBPNG_VER > 10399
- png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
+ png_uint_32 _palette_ret;
+ _palette_ret = png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
+ if (_palette_ret && _num_palette>0){
#else
_num_palette=info_ptr->num_palette;
_palette=info_ptr->palette;
-#endif
if (_num_palette>0){
+#endif
SetPalette((rgb_color*)_palette,_num_palette);
SetClrImportant(_num_palette);
} else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
@@ -199,11 +201,13 @@ bool CxImagePNG::Decode(CxFile *hFile)
int _num_trans;
png_color_16p _trans_color;
#if PNG_LIBPNG_VER > 10399
- png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
+ png_uint_32 _trans_ret;
+ _trans_ret = png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
+ if (_trans_ret && _num_trans!=0){ //palette transparency
#else
_num_trans=info_ptr->num_trans;
-#endif
if (_num_trans!=0){ //palette transparency
+#endif
if (_num_trans==1){
if (_color_type == PNG_COLOR_TYPE_PALETTE){
#if PNG_LIBPNG_VER > 10399
@@ -219,7 +223,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
#endif
}
}
+#if PNG_LIBPNG_VER > 10399
+ if (_num_trans>1 && _trans_alpha!=NULL){
+#else
if (_num_trans>1){
+#endif
RGBQUAD* pal=GetPalette();
if (pal){
DWORD ip;
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xbmc.spec 29 Dec 2011 02:33:46 -0000 1.37
+++ xbmc.spec 30 Dec 2011 19:17:24 -0000 1.38
@@ -5,7 +5,7 @@
Name: xbmc
Version: 11.0
-Release: 0.4.%{PRERELEASE}%{?dist}
+Release: 0.5.%{PRERELEASE}%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -36,29 +36,14 @@
# functionality, needs to be able fallback internal version
Patch4: xbmc-11.0-hdhomerun.patch
-# fix "@#" in Makefile which seem to screw things up no trac filed
-# yet, don't know why this isn't a problem on other Linux systems
-Patch5: xbmc-10-Makefile.patch
-
-# add patch from upstream trac http://trac.xbmc.org/ticket/9584
-# to find Python 2.7 (needed for F-14+)
-Patch6: xbmc-10-python2.7.patch
-
-# patch from upstream to fix builds for GCC 4.6.x
-# (committed to git upstream: http://trac.xbmc.org/ticket/11383)
-Patch7: xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch
-
-# upstream patches for newer libbluray support
-# commit 8c1504d0a647271ee48ff83c6eac2cd4b7670df0
-# commit e41dd86046cabe84493453c6588baaf5279710fd
-# commit d17f271d6489cc76494fbc4f3e8017a97d947af4
-Patch8: xbmc-support_newer_libbluray.patch
# libpng 1.5 patch from gentoo
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-tv/xbmc/fil...
-Patch9: xbmc-10.1-libpng-1.5.patch
-
-Patch10: xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch
+# following two patches both submitted upstream:
+# http://trac.xbmc.org/ticket/12001
+Patch5: xbmc-10.1-libpng-1.5.patch
+# second libpng 1.5 patch avoids use of uninitialised values
+Patch6: xbmc-11.0-libpng-1.5-fix-plt-trn-get.patch
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
@@ -209,12 +194,8 @@
%patch2 -p0
#patch3 -p0
%patch4 -p0
-#patch5 -p0
-#patch6 -p0
-#patch7 -p1
-#patch8 -p1
-%patch9 -p2
-#patch10 -p1
+%patch5 -p2
+%patch6 -p1
%build
@@ -290,6 +271,11 @@
%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Fri Dec 30 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.5.Eden_beta1
+- Add additional patch from http://trac.xbmc.org/ticket/12001 to
+ fix uninitialised pointer with libpng 1.5
+- Remove upstreamed, or otherwise obsoleted patches
+
* Thu Dec 29 2011 Alex Lancaster <alexlan[AT] fedoraproject org> - 11.0-0.4.Eden_beta1
- Enable libpng 1.5 patch, still needed, upstream bug is at:
http://trac.xbmc.org/ticket/12001
--- xbmc-10-Makefile.patch DELETED ---
--- xbmc-10-bootstrap.patch DELETED ---
--- xbmc-10-dvdread.patch DELETED ---
--- xbmc-10-hdhomerun.patch DELETED ---
--- xbmc-10-python2.7.patch DELETED ---
--- xbmc-10.1-Dharma-335-Python_parse_had_wrong_native_type-0.1.patch DELETED ---
--- xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch DELETED ---
--- xbmc-support_newer_libbluray.patch DELETED ---
12 years, 12 months
rpms/gecko-mediaplayer/F-15 .cvsignore, 1.17, 1.18 gecko-mediaplayer.spec, 1.31, 1.32 sources, 1.17, 1.18 gecko-mediaplayer-applefix.patch, 1.2, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31997
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Removed Files:
gecko-mediaplayer-applefix.patch
Log Message:
* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
- Updated to 1.0.5
- Dropped the included apple.com fix
- Refactored to accomodate the gmtk split
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Removed GConf logic since F-14 is EOL
- Added %{?_isa} to explicit dependencies
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 1 Jul 2011 20:10:28 -0000 1.17
+++ .cvsignore 29 Dec 2011 19:32:22 -0000 1.18
@@ -1 +1 @@
-gecko-mediaplayer-1.0.4.tar.gz
+gecko-mediaplayer-1.0.5.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/gecko-mediaplayer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gecko-mediaplayer.spec 8 Jul 2011 07:21:11 -0000 1.31
+++ gecko-mediaplayer.spec 29 Dec 2011 19:32:22 -0000 1.32
@@ -1,32 +1,21 @@
Name: gecko-mediaplayer
-Version: 1.0.4
-Release: 3%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
-Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gecko-mediaplayer
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: %{name}-applefix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
-%if 0%{?fedora} < 15
-BuildRequires: GConf2-devel
-%endif
BuildRequires: gettext
+BuildRequires: gmtk-devel == %{version}.0
BuildRequires: libcurl-devel
BuildRequires: libX11-devel
BuildRequires: gecko-devel
Requires: mozilla-filesystem
-Requires: gnome-mplayer-binary >= %{version}
-
-%if 0%{?fedora} < 15
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
+Requires: gnome-mplayer-binary%{?_isa} >= %{version}
Obsoletes: mplayerplug-in < 3.50
@@ -38,23 +27,15 @@
%prep
%setup -q
-%patch0 -p0 -b .applefix
%build
-%if 0%{?fedora} == 14
-%configure --with-gconf
-%else
%configure
-%endif
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora} < 15
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
@@ -62,34 +43,8 @@
rm -rf $RPM_BUILD_ROOT%{_docdir}/gecko-mediaplayer
-%pre
-%if 0%{?fedora} < 15
-%gconf_schema_prepare gecko-mediaplayer
-%endif
-
-
-%post
-%if 0%{?fedora} < 15
-%gconf_schema_upgrade gecko-mediaplayer
-%endif
-
-
-%preun
-%if 0%{?fedora} < 15
-%gconf_schema_remove gecko-mediaplayer
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc COPYING ChangeLog
-%if 0%{?fedora} < 15
-%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
-%endif
%{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-qt.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-rm.so
@@ -98,6 +53,18 @@
%changelog
+* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
+- Updated to 1.0.5
+- Dropped the included apple.com fix
+- Refactored to accomodate the gmtk split
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Removed GConf logic since F-14 is EOL
+- Added %%{?_isa} to explicit dependencies
+
+* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-4
+- Added an easy way to pick between GSettings and GConf2
+- Rearranged the conditionals to avoid leaving empty %%pre et al.
+
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-3
- Updated the apple.com fix
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-15/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 1 Jul 2011 20:10:28 -0000 1.17
+++ sources 29 Dec 2011 19:32:22 -0000 1.18
@@ -1 +1 @@
-7bb7665f8a1e6832907d052863e8f7aa gecko-mediaplayer-1.0.4.tar.gz
+1a96daf878d06452c0fd9a13fd186021 gecko-mediaplayer-1.0.5.tar.gz
--- gecko-mediaplayer-applefix.patch DELETED ---
12 years, 12 months
rpms/gecko-mediaplayer/F-16 .cvsignore, 1.17, 1.18 gecko-mediaplayer.spec, 1.32, 1.33 sources, 1.17, 1.18 gecko-mediaplayer-applefix.patch, 1.2, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31893
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Removed Files:
gecko-mediaplayer-applefix.patch
Log Message:
* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
- Updated to 1.0.5
- Dropped the included apple.com fix
- Refactored to accomodate the gmtk split
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Removed GConf logic since F-14 is EOL
- Added %{?_isa} to explicit dependencies
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-16/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 1 Jul 2011 20:10:20 -0000 1.17
+++ .cvsignore 29 Dec 2011 19:32:13 -0000 1.18
@@ -1 +1 @@
-gecko-mediaplayer-1.0.4.tar.gz
+gecko-mediaplayer-1.0.5.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-16/gecko-mediaplayer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gecko-mediaplayer.spec 17 Jul 2011 01:06:14 -0000 1.32
+++ gecko-mediaplayer.spec 29 Dec 2011 19:32:13 -0000 1.33
@@ -1,38 +1,21 @@
-%if 0%{?fedora} < 15
-%bcond_without gconf
-%else
-%bcond_with gconf
-%endif
-
Name: gecko-mediaplayer
-Version: 1.0.4
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
-Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gecko-mediaplayer
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: %{name}-applefix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
-%if %{with gconf}
-BuildRequires: GConf2-devel
-%endif
BuildRequires: gettext
+BuildRequires: gmtk-devel == %{version}.0
BuildRequires: libcurl-devel
BuildRequires: libX11-devel
BuildRequires: gecko-devel
Requires: mozilla-filesystem
-Requires: gnome-mplayer-binary >= %{version}
-
-%if %{with gconf}
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
+Requires: gnome-mplayer-binary%{?_isa} >= %{version}
Obsoletes: mplayerplug-in < 3.50
@@ -44,19 +27,15 @@
%prep
%setup -q
-%patch0 -p0 -b .applefix
%build
-%configure %{?with_gconf:--with-gconf}
+%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%if %{with gconf}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
@@ -64,34 +43,8 @@
rm -rf $RPM_BUILD_ROOT%{_docdir}/gecko-mediaplayer
-%if %{with gconf}
-%pre
-%gconf_schema_prepare gecko-mediaplayer
-%endif
-
-
-%if %{with gconf}
-%post
-%gconf_schema_upgrade gecko-mediaplayer
-%endif
-
-
-%if %{with gconf}
-%preun
-%gconf_schema_remove gecko-mediaplayer
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc COPYING ChangeLog
-%if %{with gconf}
-%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
-%endif
%{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-qt.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-rm.so
@@ -100,6 +53,14 @@
%changelog
+* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
+- Updated to 1.0.5
+- Dropped the included apple.com fix
+- Refactored to accomodate the gmtk split
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Removed GConf logic since F-14 is EOL
+- Added %%{?_isa} to explicit dependencies
+
* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-4
- Added an easy way to pick between GSettings and GConf2
- Rearranged the conditionals to avoid leaving empty %%pre et al.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-16/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 1 Jul 2011 20:10:20 -0000 1.17
+++ sources 29 Dec 2011 19:32:13 -0000 1.18
@@ -1 +1 @@
-7bb7665f8a1e6832907d052863e8f7aa gecko-mediaplayer-1.0.4.tar.gz
+1a96daf878d06452c0fd9a13fd186021 gecko-mediaplayer-1.0.5.tar.gz
--- gecko-mediaplayer-applefix.patch DELETED ---
12 years, 12 months
rpms/gecko-mediaplayer/devel .cvsignore, 1.17, 1.18 gecko-mediaplayer.spec, 1.32, 1.33 sources, 1.17, 1.18 gecko-mediaplayer-applefix.patch, 1.2, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31782
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Removed Files:
gecko-mediaplayer-applefix.patch
Log Message:
* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
- Updated to 1.0.5
- Dropped the included apple.com fix
- Refactored to accomodate the gmtk split
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Removed GConf logic since F-14 is EOL
- Added %{?_isa} to explicit dependencies
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 1 Jul 2011 20:10:20 -0000 1.17
+++ .cvsignore 29 Dec 2011 19:32:03 -0000 1.18
@@ -1 +1 @@
-gecko-mediaplayer-1.0.4.tar.gz
+gecko-mediaplayer-1.0.5.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gecko-mediaplayer.spec 17 Jul 2011 01:06:14 -0000 1.32
+++ gecko-mediaplayer.spec 29 Dec 2011 19:32:03 -0000 1.33
@@ -1,38 +1,21 @@
-%if 0%{?fedora} < 15
-%bcond_without gconf
-%else
-%bcond_with gconf
-%endif
-
Name: gecko-mediaplayer
-Version: 1.0.4
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
-Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gecko-mediaplayer
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: %{name}-applefix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
-%if %{with gconf}
-BuildRequires: GConf2-devel
-%endif
BuildRequires: gettext
+BuildRequires: gmtk-devel == %{version}.0
BuildRequires: libcurl-devel
BuildRequires: libX11-devel
BuildRequires: gecko-devel
Requires: mozilla-filesystem
-Requires: gnome-mplayer-binary >= %{version}
-
-%if %{with gconf}
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
+Requires: gnome-mplayer-binary%{?_isa} >= %{version}
Obsoletes: mplayerplug-in < 3.50
@@ -44,19 +27,15 @@
%prep
%setup -q
-%patch0 -p0 -b .applefix
%build
-%configure %{?with_gconf:--with-gconf}
+%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%if %{with gconf}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
@@ -64,34 +43,8 @@
rm -rf $RPM_BUILD_ROOT%{_docdir}/gecko-mediaplayer
-%if %{with gconf}
-%pre
-%gconf_schema_prepare gecko-mediaplayer
-%endif
-
-
-%if %{with gconf}
-%post
-%gconf_schema_upgrade gecko-mediaplayer
-%endif
-
-
-%if %{with gconf}
-%preun
-%gconf_schema_remove gecko-mediaplayer
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc COPYING ChangeLog
-%if %{with gconf}
-%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
-%endif
%{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-qt.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-rm.so
@@ -100,6 +53,14 @@
%changelog
+* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
+- Updated to 1.0.5
+- Dropped the included apple.com fix
+- Refactored to accomodate the gmtk split
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Removed GConf logic since F-14 is EOL
+- Added %%{?_isa} to explicit dependencies
+
* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-4
- Added an easy way to pick between GSettings and GConf2
- Rearranged the conditionals to avoid leaving empty %%pre et al.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 1 Jul 2011 20:10:20 -0000 1.17
+++ sources 29 Dec 2011 19:32:03 -0000 1.18
@@ -1 +1 @@
-7bb7665f8a1e6832907d052863e8f7aa gecko-mediaplayer-1.0.4.tar.gz
+1a96daf878d06452c0fd9a13fd186021 gecko-mediaplayer-1.0.5.tar.gz
--- gecko-mediaplayer-applefix.patch DELETED ---
12 years, 12 months
rpms/gnome-mplayer/F-15 .cvsignore, 1.19, 1.20 gnome-mplayer.spec, 1.37, 1.38 sources, 1.19, 1.20 gnome-mplayer-applefix.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31335
Modified Files:
.cvsignore gnome-mplayer.spec sources
Removed Files:
gnome-mplayer-applefix.patch
Log Message:
* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
- Updated to 1.0.5
- Dropped the included apple.com fix
- Refactored to accomodate the gmtk split
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Removed GConf logic since F-14 is EOL
- Added %{?_isa} to explicit dependencies
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-15/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 1 Jul 2011 20:08:30 -0000 1.19
+++ .cvsignore 29 Dec 2011 19:30:20 -0000 1.20
@@ -1 +1 @@
-gnome-mplayer-1.0.4.tar.gz
+gnome-mplayer-1.0.5.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-15/gnome-mplayer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-mplayer.spec 8 Jul 2011 07:38:43 -0000 1.37
+++ gnome-mplayer.spec 29 Dec 2011 19:30:20 -0000 1.38
@@ -1,30 +1,20 @@
%bcond_without minimal
Name: gnome-mplayer
-Version: 1.0.4
-Release: 2%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
-Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: %{name}-applefix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-%if 0%{?fedora} < 15
-BuildRequires: GConf2-devel
-%endif
BuildRequires: gettext
-BuildRequires: gnome-power-manager
-%if 0%{?fedora} >= 15
+BuildRequires: gmtk-devel == %{version}.0
BuildRequires: gtk3-devel
-%else
-BuildRequires: gtk2-devel
-%endif
BuildRequires: libcurl-devel
BuildRequires: libgpod-devel
BuildRequires: libmusicbrainz3-devel
@@ -34,11 +24,11 @@
BuildRequires: pulseaudio-libs-devel
Requires: control-center-filesystem
-Requires: gvfs-fuse
-Requires: mencoder
-Requires: %{name}-common = %{version}-%{release}
+Requires: gvfs-fuse%{?_isa}
+Requires: mencoder%{?_isa}
+Requires: %{name}-common%{?_isa} = %{version}-%{release}
-Provides: %{name}-binary = %{version}-%{release}
+Provides: %{name}-binary%{?_isa} = %{version}-%{release}
%description
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -50,14 +40,6 @@
%package common
Summary: An MPlayer GUI, common files
-Group: Applications/Multimedia
-Requires: mplayer
-
-%if 0%{?fedora} < 15
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
%description common
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -70,9 +52,8 @@
%if %{with minimal}
%package minimal
Summary: An MPlayer GUI, a minimal version
-Group: Applications/Multimedia
-Requires: %{name}-common = %{version}-%{release}
-Provides: %{name}-binary = %{version}-%{release}
+Requires: %{name}-common%{?_isa} = %{version}-%{release}
+Provides: %{name}-binary%{?_isa} = %{version}-%{release}
%description minimal
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -86,9 +67,8 @@
%package nautilus
Summary: An MPlayer GUI, nautilus extension
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: nautilus-extensions
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: nautilus-extensions%{?_isa}
%description nautilus
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -103,42 +83,21 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
-pushd generic
-%patch0 -p0 -b .applefix
-popd
%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
-pushd minimal
-%patch0 -p0 -b .applefix
-popd
%endif
%build
pushd generic
-%if 0%{?fedora} >= 15
-%configure --enable-gtk3
-%else
-%if 0%{?fedora} == 14
-%configure --with-gconf
-%else
%configure
-%endif
-%endif
make %{?_smp_mflags}
popd
%if %{with minimal}
pushd minimal
%configure --program-suffix=-minimal --without-gio --without-libnotify \
-%if 0%{?fedora} >= 15
- --enable-gtk3 \
-%else
-%if 0%{?fedora} == 14
- --with-gconf \
-%endif
-%endif
--without-libgpod --without-libmusicbrainz3 --disable-nautilus
make %{?_smp_mflags}
popd
@@ -149,17 +108,11 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
-%if 0%{?fedora} < 15
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
popd
%if %{with minimal}
pushd minimal
-%if 0%{?fedora} < 15
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
popd
%endif
@@ -176,11 +129,6 @@
find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
-%pre common
-%if 0%{?fedora} < 15
-%gconf_schema_prepare gnome-mplayer
-%endif
-
%post
update-desktop-database &> /dev/null || :
@@ -189,74 +137,58 @@
update-desktop-database &> /dev/null || :
-%post common
-%if 0%{?fedora} < 15
-%gconf_schema_upgrade gnome-mplayer
-%endif
-
-
%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-%if 0%{?fedora} >= 15
if [ $1 -eq 0 ] ; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
-%endif
%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if 0%{?fedora} >= 15
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%endif
-
-
-%preun common
-%if 0%{?fedora} < 15
-%gconf_schema_remove gnome-mplayer
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%{_bindir}/gnome-mplayer
%{_datadir}/applications/rpmfusion-gnome-mplayer.desktop
%{_datadir}/gnome-control-center/default-apps/gnome-mplayer.xml
%files common -f %{name}.lang
-%defattr(-,root,root,-)
%doc generic/COPYING generic/ChangeLog generic/README generic/DOCS/keyboard_shortcuts.txt generic/DOCS/tech/*
-%if 0%{?fedora} < 15
-%{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
-%else
%{_datadir}/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
%{_datadir}/glib-2.0/schemas/apps.gnome-mplayer.preferences.*
-%endif
%{_datadir}/icons/hicolor/*/apps/gnome-mplayer.*
%{_mandir}/man1/gnome-mplayer.1*
%if %{with minimal}
%files minimal
-%defattr(-,root,root,-)
%{_bindir}/gnome-mplayer-minimal
%endif
%files nautilus
-%defattr(-,root,root,-)
%{_libdir}/nautilus/extensions-?.0/libgnome-mplayer-properties-page.so*
%changelog
+* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
+- Updated to 1.0.5
+- Dropped the included apple.com fix
+- Refactored to accomodate the gmtk split
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Removed GConf logic since F-14 is EOL
+- Added %%{?_isa} to explicit dependencies
+
+* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-3
+- Added an easy way to pick between GSettings and GConf2
+- Rearranged the conditionals to avoid leaving empty %%pre et al.
+
* Fri Jul 08 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-2
- Fixed apple.com regression using a patch from SVN
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-15/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 1 Jul 2011 20:08:30 -0000 1.19
+++ sources 29 Dec 2011 19:30:20 -0000 1.20
@@ -1 +1 @@
-c97dcf12d6a6b5543d701944f95e850e gnome-mplayer-1.0.4.tar.gz
+1d3ab24c5501b5528e357931ca4dc6da gnome-mplayer-1.0.5.tar.gz
--- gnome-mplayer-applefix.patch DELETED ---
12 years, 12 months
rpms/gnome-mplayer/F-16 .cvsignore, 1.19, 1.20 gnome-mplayer.spec, 1.38, 1.39 sources, 1.19, 1.20 gnome-mplayer-applefix.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31233
Modified Files:
.cvsignore gnome-mplayer.spec sources
Removed Files:
gnome-mplayer-applefix.patch
Log Message:
* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
- Updated to 1.0.5
- Dropped the included apple.com fix
- Refactored to accomodate the gmtk split
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Removed GConf logic since F-14 is EOL
- Added %{?_isa} to explicit dependencies
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-16/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 1 Jul 2011 20:08:20 -0000 1.19
+++ .cvsignore 29 Dec 2011 19:30:10 -0000 1.20
@@ -1 +1 @@
-gnome-mplayer-1.0.4.tar.gz
+gnome-mplayer-1.0.5.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-16/gnome-mplayer.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-mplayer.spec 17 Jul 2011 01:04:08 -0000 1.38
+++ gnome-mplayer.spec 29 Dec 2011 19:30:10 -0000 1.39
@@ -1,36 +1,20 @@
%bcond_without minimal
-%if 0%{?fedora} < 15
-%bcond_without gconf
-%else
-%bcond_with gconf
-%endif
-
Name: gnome-mplayer
-Version: 1.0.4
-Release: 3%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
-Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: %{name}-applefix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-%if %{with gconf}
-BuildRequires: GConf2-devel
-%endif
BuildRequires: gettext
-BuildRequires: gnome-power-manager
-%if 0%{?fedora} >= 15
+BuildRequires: gmtk-devel == %{version}.0
BuildRequires: gtk3-devel
-%else
-BuildRequires: gtk2-devel
-%endif
BuildRequires: libcurl-devel
BuildRequires: libgpod-devel
BuildRequires: libmusicbrainz3-devel
@@ -40,11 +24,11 @@
BuildRequires: pulseaudio-libs-devel
Requires: control-center-filesystem
-Requires: gvfs-fuse
-Requires: mencoder
-Requires: %{name}-common = %{version}-%{release}
+Requires: gvfs-fuse%{?_isa}
+Requires: mencoder%{?_isa}
+Requires: %{name}-common%{?_isa} = %{version}-%{release}
-Provides: %{name}-binary = %{version}-%{release}
+Provides: %{name}-binary%{?_isa} = %{version}-%{release}
%description
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -56,14 +40,6 @@
%package common
Summary: An MPlayer GUI, common files
-Group: Applications/Multimedia
-Requires: mplayer
-
-%if %{with gconf}
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-%endif
%description common
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -76,9 +52,8 @@
%if %{with minimal}
%package minimal
Summary: An MPlayer GUI, a minimal version
-Group: Applications/Multimedia
-Requires: %{name}-common = %{version}-%{release}
-Provides: %{name}-binary = %{version}-%{release}
+Requires: %{name}-common%{?_isa} = %{version}-%{release}
+Provides: %{name}-binary%{?_isa} = %{version}-%{release}
%description minimal
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -92,9 +67,8 @@
%package nautilus
Summary: An MPlayer GUI, nautilus extension
-Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Requires: nautilus-extensions
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: nautilus-extensions%{?_isa}
%description nautilus
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -109,36 +83,22 @@
%setup -qcT
tar -xzf %{SOURCE0}
mv %{name}-%{version} generic
-pushd generic
-%patch0 -p0 -b .applefix
-popd
%if %{with minimal}
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
-pushd minimal
-%patch0 -p0 -b .applefix
-popd
%endif
%build
pushd generic
-%if 0%{?fedora} >= 15
-%configure --enable-gtk3 %{?with_gconf:--with-gconf}
-%else
-%configure %{?with_gconf:--with-gconf}
-%endif
+%configure
make %{?_smp_mflags}
popd
%if %{with minimal}
pushd minimal
%configure --program-suffix=-minimal --without-gio --without-libnotify \
-%if 0%{?fedora} >= 15
- --enable-gtk3 \
-%endif
- --without-libgpod --without-libmusicbrainz3 --disable-nautilus \
- %{?with_gconf:--with-gconf}
+ --without-libgpod --without-libmusicbrainz3 --disable-nautilus
make %{?_smp_mflags}
popd
%endif
@@ -148,17 +108,11 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
-%if %{with gconf}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
popd
%if %{with minimal}
pushd minimal
-%if %{with gconf}
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%endif
make install DESTDIR=$RPM_BUILD_ROOT
popd
%endif
@@ -175,11 +129,6 @@
find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \;
-%if %{with gconf}
-%pre common
-%gconf_schema_prepare gnome-mplayer
-%endif
-
%post
update-desktop-database &> /dev/null || :
@@ -188,74 +137,54 @@
update-desktop-database &> /dev/null || :
-%if %{with gconf}
-%post common
-%gconf_schema_upgrade gnome-mplayer
-%endif
-
-
%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-%if ! %{with gconf}
if [ $1 -eq 0 ] ; then
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
-%endif
%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%if ! %{with gconf}
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%endif
-
-
-%if %{with gconf}
-%preun common
-%gconf_schema_remove gnome-mplayer
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%{_bindir}/gnome-mplayer
%{_datadir}/applications/rpmfusion-gnome-mplayer.desktop
%{_datadir}/gnome-control-center/default-apps/gnome-mplayer.xml
%files common -f %{name}.lang
-%defattr(-,root,root,-)
%doc generic/COPYING generic/ChangeLog generic/README generic/DOCS/keyboard_shortcuts.txt generic/DOCS/tech/*
-%if %{with gconf}
-%{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
-%else
%{_datadir}/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
%{_datadir}/glib-2.0/schemas/apps.gnome-mplayer.preferences.*
-%endif
%{_datadir}/icons/hicolor/*/apps/gnome-mplayer.*
%{_mandir}/man1/gnome-mplayer.1*
%if %{with minimal}
%files minimal
-%defattr(-,root,root,-)
%{_bindir}/gnome-mplayer-minimal
%endif
%files nautilus
-%defattr(-,root,root,-)
%{_libdir}/nautilus/extensions-?.0/libgnome-mplayer-properties-page.so*
%changelog
+* Thu Dec 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.5-1
+- Updated to 1.0.5
+- Dropped the included apple.com fix
+- Refactored to accomodate the gmtk split
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Removed GConf logic since F-14 is EOL
+- Added %%{?_isa} to explicit dependencies
+
* Sat Jul 16 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.4-3
- Added an easy way to pick between GSettings and GConf2
- Rearranged the conditionals to avoid leaving empty %%pre et al.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-16/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 1 Jul 2011 20:08:20 -0000 1.19
+++ sources 29 Dec 2011 19:30:10 -0000 1.20
@@ -1 +1 @@
-c97dcf12d6a6b5543d701944f95e850e gnome-mplayer-1.0.4.tar.gz
+1d3ab24c5501b5528e357931ca4dc6da gnome-mplayer-1.0.5.tar.gz
--- gnome-mplayer-applefix.patch DELETED ---
12 years, 12 months