updated gnome-mplayer-vl.spec, gecko-mediaplayer-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3511 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gecko-mediaplayer/gecko-mediaplayer-vl.spec

@@ -1,17 +1,18 @@
 %define with_my_japo 0
-#% define svnrevision 355
+%define svnrevision 432
 #% define rcversion 3
+%define betaversion beta
 
 Name:           gecko-mediaplayer
-Version:        1.0.0
-Release:        1%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}%{?_dist_release}
+Version:        1.0.3
+Release:        1%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}%{?_dist_release}
 Summary:        Gnome MPlayer browser plugin
 Summary(ja):    Gnome MPlayer の Web ブラウザ用プラグイン
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/gecko-mediaplayer
-Source0:        http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}.tar.%{?svnrevision:bz2}%{!?svnrevision:gz}
+Source0:        http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}%{?betaversion:%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}.tar.%{?svnrevision:bz2}%{!?svnrevision:gz}
 Source10:       gecko-mediaplayer-snapshot.sh
 
 ## vine
@@ -24,10 +25,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  GConf2-devel
+BuildRequires:  curl-devel
 BuildRequires:  gettext
 BuildRequires:  libX11-devel
 #BuildRequires:  gecko-devel
-BuildRequires:  xulrunner-devel >= 1.9.1
+BuildRequires:  xulrunner-devel >= 1.9.2
 
 Requires:       firefox >= 3.5
 #Requires:       %{_libdir}/mozilla/plugins
@@ -37,7 +39,7 @@ Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Obsoletes:      mplayerplug-in < 3.50
+Obsoletes:      mplayerplug-in <= 3.55
 
 %description
 Gecko Media Player is a browser plugin that uses GNOME MPlayer to play media in
@@ -52,7 +54,8 @@ Unix-ish なシステム（Linux, BSD, Solaris）上のすべてのブラウザ
 
 
 %prep
-%setup -q %{?rcversion:-n %{name}-%{version}.rc%{rcversion}}
+#% setup -q %{?rcversion:-n %{name}-%{version}.rc%{rcversion}}
+%setup -q %{?betaversion:-n %{name}-%{version}%betaversion}
 
 %if %{with_my_japo}
 ## vine
@@ -62,13 +65,17 @@ autoreconf -f
 %endif
 
 %build
-%configure
+%configure \
+    --enable-new-libxul \
+    \
+    --with-libcurl \
+    ;
 %__make %{?_smp_mflags}
 
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %__make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
@@ -76,29 +83,29 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %__rm -rf $RPM_BUILD_ROOT%{_docdir}/gecko-mediaplayer
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas >/dev/null || :
-    # If the schema file has ever been renamed::
-    #gconftool-2 --makefile-uninstall-rule \
-    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-fi
+# %pre
+# if [ "$1" -gt 1 ]; then
+#     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#     gconftool-2 --makefile-uninstall-rule \
+#       %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas >/dev/null || :
+#     # If the schema file has ever been renamed::
+#     #gconftool-2 --makefile-uninstall-rule \
+#     #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
+# fi
 
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
+# %post
+# export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+# gconftool-2 --makefile-install-rule \
+#   %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
 
 
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
-fi
+# %preun
+# if [ "$1" -eq 0 ]; then
+#     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#     gconftool-2 --makefile-uninstall-rule \
+#       %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
+# fi
 
 
 %clean
@@ -108,7 +115,7 @@ fi
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog
-%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
+#%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
 %{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
 %{_libdir}/mozilla/plugins/gecko-mediaplayer-qt.so
 %{_libdir}/mozilla/plugins/gecko-mediaplayer-rm.so
@@ -117,6 +124,9 @@ fi
 
 
 %changelog
+* Sun Apr 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.3-1.beta.svn432
+- source snapshot 1.0.3beta r432
+
 * Sat Nov 06 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.0-1
 - new upstream release
 

g/gnome-mplayer/gnome-mplayer-vl.spec

@@ -1,13 +1,13 @@
 #TODO: Nautilus extention
 %define with_nautilus 0
-%define with_my_japo 0
-#% define svnrevision 1912
-#% define betaversion b1
+%define with_my_japo 1
+%define svnrevision 1989
+%define betaversion beta
 
 %define GNOME_MPLAYER_BIN %{_libexecdir}/%{name}
 
 Name:           gnome-mplayer
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?_dist_release}
 Summary:        An MPlayer GUI, a full-featured binary
 Summary(ja):    高機能な MPlayer のグラフィカルユーザーインターフェース
@@ -20,8 +20,7 @@ Source50:       gnome-mplayer.sh.in
 
 ## vine
 %if %{with_my_japo}
-Source100:      gnome-mplayer-1.0.1b1.svn1892-ja.po
-#Source101:      gnome-mplayer-0.9.99.rc1.desktop
+Source100:      gnome-mplayer-1.0.3beta.svn1989-ja.po
 %endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -32,11 +31,12 @@ BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
+BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
 BuildRequires:  libgpod-devel
-%if %{?_dist_release} == "vl6"
+%if %{?_dist_release} != "vl5"
 BuildRequires:  libmusicbrainz3-devel
 %endif
 #BuildRequires:  libmusicbrainz-devel
@@ -110,7 +110,6 @@ GNOME MPlayer のインスタンスを制御できます．
 %if %{with_my_japo}
 ## vine
 %__install -m644 %{SOURCE100} po/ja.po
-#%__install -m644 %{SOURCE101} gnome-mplayer.desktop
 %endif
 
 
@@ -120,6 +119,16 @@ GNOME MPlayer のインスタンスを制御できます．
     %if !%{with_nautilus}
     --disable-nautilus \
     %endif
+    --disable-schemas-compile \
+    \
+    --with-dbus \
+    --with-alsa \
+    --with-pulseaudio \
+    --with-libnotify \
+    --with-libgpod \
+    %if %{?_dist_release} != "vl5"
+    --with-libmusicbrainz3 \
+    %endif
     ;
 %__make %{?_smp_mflags}
 
@@ -149,15 +158,15 @@ desktop-file-install --vendor=vine \
 find $RPM_BUILD_ROOT -name *.la -exec %__rm -f {} \;
 
 
-%pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas >/dev/null || :
-    # If the schema file has ever been renamed::
-    #gconftool-2 --makefile-uninstall-rule \
-    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-fi
+# %pre
+# if [ "$1" -gt 1 ]; then
+#     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#     gconftool-2 --makefile-uninstall-rule \
+#       %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas >/dev/null || :
+#     # If the schema file has ever been renamed::
+#     #gconftool-2 --makefile-uninstall-rule \
+#     #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
+# fi
 
 
 %post
@@ -167,18 +176,27 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi 
 update-desktop-database &> /dev/null || :
 
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas > /dev/null || :
+# export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+# gconftool-2 --makefile-install-rule \
+#   %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas > /dev/null || :
 
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas > /dev/null || :
-fi
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+# update-desktop-database %{_datadir}/applications/
+
+# %preun
+# if [ "$1" -eq 0 ]; then
+#     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#     gconftool-2 --makefile-uninstall-rule \
+#       %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas > /dev/null || :
+# fi
 
 %postun
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+  update-desktop-database %{_datadir}/applications/
+fi
+
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -197,7 +215,10 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/applications/*-gnome-mplayer.desktop
 %{_datadir}/gnome-control-center/default-apps/gnome-mplayer.xml
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README DOCS/* DOCS/tech/*
-%{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
+# %{_sysconfdir}/gconf/schemas/gnome-mplayer.schemas
+%{_datadir}/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
+%{_datadir}/glib-2.0/schemas/apps.gnome-mplayer.preferences.enums.xml
+%{_datadir}/glib-2.0/schemas/apps.gnome-mplayer.preferences.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/gnome-mplayer.*
 %{_mandir}/man1/gnome-mplayer.1.gz
 
@@ -209,6 +230,12 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sun Apr 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.3-1.beta.svn1989
+- source snapshot 1.0.3beta r1989
+  - added --disable-schemas-compile in configure options
+  - use GSettings (%%posttrans, %%postun)
+- updated Japanese translation (gnome-mplayer-1.0.3beta.svn1989-ja.po)
+
 * Tue Mar 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.1-2
 - new upstream release