Browse Source

updated gnome-mplayer and gecko-mediaplayer; added gmtk: common library for gnome-mplayer and gecko-mediaplayer

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4977 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
071c194e65

+ 14 - 10
g/gecko-mediaplayer/gecko-mediaplayer-vl.spec

@@ -1,11 +1,11 @@
-%define with_my_japo 0
-#% define svnrevision 450
+%define with_my_japo 1
+%define svnrevision 477
 #% define rcversion 3
-#% define betaversion b2
+%define betaversion b1
 
 Name:           gecko-mediaplayer
-Version:        1.0.4
-Release:        4%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}%{?_dist_release}
+Version:        1.0.5
+Release:        1%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}%{?_dist_release}
 Summary:        Gnome MPlayer browser plugin
 Summary(ja):    Gnome MPlayer の Web ブラウザ用プラグイン
 
@@ -17,12 +17,12 @@ Source10:       gecko-mediaplayer-snapshot.sh
 
 ## vine
 %if %{with_my_japo}
-Patch100:       gecko-mediaplayer-0.9.4-ja.patch
-Source100:      gecko-mediaplayer-0.9.4-ja.po
+Source100:      gecko-mediaplayer-1.0.5b1.svn477-ja.po
 %endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires:  gmtk-devel >= 1.0.5
 BuildRequires:  dbus-glib-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  curl-devel
@@ -57,11 +57,9 @@ Unix-ish なシステム(Linux, BSD, Solaris)上のすべてのブラウザ
 #% setup -q %{?rcversion:-n %{name}-%{version}.rc%{rcversion}}
 %setup -q %{?betaversion:-n %{name}-%{version}%betaversion}
 
-%if %{with_my_japo}
 ## vine
-%patch100 -p1 -b .ja
+%if %{with_my_japo}
 %__install -m644 %{SOURCE100} po/ja.po
-autoreconf -f
 %endif
 
 %build
@@ -124,6 +122,11 @@ autoreconf -f
 
 
 %changelog
+* Sat Oct 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.5-1.b1.svn477
+- source 1.0.5b1
+- updated ja.po
+- added BuildRequires: gmtk-devel >= 1.0.5
+
 * Sun Sep 25 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.4-4
 - rebuilt with libnotify-0.7.4
 
@@ -135,6 +138,7 @@ autoreconf -f
 
 * Mon Jun 06 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.4-1.b1.svn450
 - source snapshot 1.0.4b1.svn450
+- do not use gconf
 
 * Fri Apr 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.3-3
 - new upstream release

+ 31 - 0
g/gmtk/gmtk-snapshot.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+    set +e
+    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+
+dirname=gmtk
+
+cd "$tmp"
+svn checkout http://gmtk.googlecode.com/svn/trunk/ $dirname
+cd $dirname
+#eval `autoconf configure.in | egrep '^[[:blank:]]*VERSION='`
+eval $(egrep '^[[:blank:]]*PACKAGE_VERSION=' configure) && VERSION=$PACKAGE_VERSION || exit 1
+REVISION=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+find . -type d -name .svn -print0 | xargs -0r rm -rf
+cd ..
+mv $dirname ${dirname}-${VERSION}
+#tar jcf "$pwd"/${dirname}-${VERSION}.svn${REVISION}.tar.bz2 ${dirname}-${VERSION}
+tar Jcf "$pwd"/${dirname}-${VERSION}.svn${REVISION}.tar.xz ${dirname}-${VERSION}
+cd ${pwd} >/dev/null
+
+exit

+ 88 - 0
g/gmtk/gmtk-vl.spec

@@ -0,0 +1,88 @@
+%define with_my_japo 1
+%define svnrevision 56
+#% define rcversion 1
+%define betaversion b1
+
+Name:           gmtk           
+Version:        1.0.5
+Release:        1%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}%{?_dist_release}
+Summary:        Library of common functions and widgets for gnome-mplayer and gecko-mediaplayer
+
+License:        GPLv2+
+URL:            http://code.google.com/p/%{name}/ 
+Source0:        http://code.google.com/p/%{name}/files/%{name}-%{version}%{?betaversion:%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}.tar.%{?svnrevision:xz}%{!?svnrevision:gz}
+Source10:       gmtk-snapshot.sh
+
+## vine
+%if %{with_my_japo}
+Source100:      gmtk-1.0.5b1.svn56-ja.po
+%endif
+
+BuildRequires:  alsa-lib-devel
+BuildRequires:  GConf2-devel
+BuildRequires:  gettext
+%if %{?_dist_release} == "vl7"
+BuildRequires:  gtk3-devel
+%elseif %{?_dist_release} == "vl6"
+BuildRequires:  gtk2-devel
+%endif
+BuildRequires:  intltool
+BuildRequires:  pulseaudio-libs-devel
+#Requires:       mplayer
+
+%description
+Library of common functions and widgets for gnome-mplayer and gecko-mediaplayer
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+#% setup -q %{?rcversion:-n %{name}-%{version}.rc%{rcversion}}
+%setup -q %{?betaversion:-n %{name}-%{version}%betaversion}
+
+## vine
+%if %{with_my_japo}
+%__install -m644 %{SOURCE100} po/ja.po
+%endif
+
+##
+autoreconf --install --force --verbose
+
+%build
+%configure --disable-static
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec %__rm -f {} ';'
+%find_lang %{name}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files -f %{name}.lang
+%{_docdir}/%{name}
+%{_libdir}/*.so.*
+
+%files devel
+%doc
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+
+%changelog
+* Sat Oct 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.5-1.b1.svn56
+- initial build
+- updated ja.po

+ 28 - 9
g/gnome-mplayer/gnome-mplayer-vl.spec

@@ -1,30 +1,32 @@
 #TODO: Nautilus extention
 %define with_nautilus 0
-%define with_my_japo 0
-#% define svnrevision 2124
-#% define betaversion b2
+%define with_my_japo 1
+%define svnrevision 2180
+#% define rcversion 1
+%define betaversion b1
 
 %define GNOME_MPLAYER_BIN %{_libexecdir}/%{name}
 
 Name:           gnome-mplayer
-Version:        1.0.4
-Release:        4%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?_dist_release}
+Version:        1.0.5
+Release:        1%{?betaversion:.%betaversion}%{?svnrevision:.svn%svnrevision}%{?_dist_release}
 Summary:        An MPlayer GUI, a full-featured binary
 Summary(ja):    高機能な MPlayer のグラフィカルユーザーインターフェース
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/gnomemplayer
-Source0:        http://gnome-mplayer.googlecode.com/files/%{name}-%{version}%{?betaversion:%betaversion}%{?svnrevision:.svn%svnrevision}.tar.%{?svnrevision:xz}%{!?svnrevision:gz}
+Source0:        http://gnome-mplayer.googlecode.com/files/%{name}-%{version}%{?betaversion:%betaversion}%{?svnrevision:.svn%svnrevision}%{?rcversion:.rc%rcversion}.tar.%{?svnrevision:xz}%{!?svnrevision:gz}
 Source10:       gnome-mplayer-snapshot.sh
 Source50:       gnome-mplayer.sh.in
 
 ## vine
 %if %{with_my_japo}
-Source100:      gnome-mplayer-1.0.4b1.svn2124-ja.po
+Source100:      gnome-mplayer-1.0.5b1.svn2180-ja.po
 %endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires:  gmtk-devel >= 1.0.5
 BuildRequires:  alsa-lib-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  dbus-glib-devel
@@ -32,7 +34,11 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  GConf2-devel
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
+%if %{?_dist_release} == "vl7"
+BuildRequires:  gtk3-devel
+%elseif %{?_dist_release} == "vl6"
 BuildRequires:  gtk2-devel
+%endif
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
 BuildRequires:  libgpod-devel
@@ -105,17 +111,20 @@ GNOME MPlayer のインスタンスを制御できます.
 %endif
 
 %prep
+#% setup -q %{?rcversion:-n %{name}-%{version}.rc%{rcversion}}
 %setup -q %{?betaversion:-n %{name}-%{version}%betaversion}
 
-%if %{with_my_japo}
 ## vine
+%if %{with_my_japo}
 %__install -m644 %{SOURCE100} po/ja.po
 %endif
 
 
 %build
 %configure \
-    --disable-static \
+    %if %{?_dist_release} == "vl7"
+    --enable-gtk3 \
+    %endif
     %if !%{with_nautilus}
     --disable-nautilus \
     %endif
@@ -230,6 +239,15 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Oct 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.5-1.b1.svn2180
+- source 1.0.5b1
+- updated ja.po
+- added BuildRequires: gmtk-devel >= 1.0.5
+  - dropped --disable-static from %%configure
+- enable gtk3 for vl7
+  - added BuildRequires: gtk3-devel
+  - added --enable-gtk3 in %%configure
+
 * Sun Sep 25 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.4-4
 - rebuilt with libnotify-0.7.4
 
@@ -241,6 +259,7 @@ update-desktop-database &> /dev/null || :
 
 * Sun Jun 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.4-1.b1.svn2124
 - source snapshot 1.0.4b1 r2124
+- use gsettings
 
 * Fri Apr 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.3-3
 - new upstream release