Browse Source

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

kudoh 13 years ago
parent
commit
78bc0402fe

+ 16 - 1
p/parole/parole-vl.spec

@@ -1,10 +1,11 @@
 # by default don't build the browser plugin
 # by default don't build the browser plugin
 # use bcond_without to change the default
 # use bcond_without to change the default
 #%bcond_with mozilla
 #%bcond_with mozilla
+%define PAROLE_BIN %{_libexecdir}/%{name}
 
 
 Name:           parole
 Name:           parole
 Version:        0.2.0.6
 Version:        0.2.0.6
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Media player for the Xfce desktop
 Summary:        Media player for the Xfce desktop
 Summary(ja):    Xfce デスクトップのメディアプレーヤー
 Summary(ja):    Xfce デスクトップのメディアプレーヤー
 
 
@@ -12,6 +13,7 @@ Group:          Applications/Multimedia
 License:        GPLv2+
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/parole
 URL:            http://goodies.xfce.org/projects/applications/parole
 Source0:        http://archive.xfce.org/src/apps/parole/0.2/%{name}-%{version}.tar.bz2
 Source0:        http://archive.xfce.org/src/apps/parole/0.2/%{name}-%{version}.tar.bz2
+Source10:       parole.sh
 Patch1:		parole-0.2.0.6-dsofix.patch
 Patch1:		parole-0.2.0.6-dsofix.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -37,6 +39,8 @@ BuildRequires:  intltool
 BuildRequires:  gtk-doc
 BuildRequires:  gtk-doc
 Requires:       gstreamer-plugins-good
 Requires:       gstreamer-plugins-good
 
 
+Obsoletes: %{name}-mozplugin
+
 %description
 %description
 Parole is a modern simple media player based on the GStreamer framework and 
 Parole is a modern simple media player based on the GStreamer framework and 
 written to fit well in the Xfce desktop. Parole features playback of local 
 written to fit well in the Xfce desktop. Parole features playback of local 
@@ -108,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 
+## wrapper install
+%__mkdir_p $RPM_BUILD_ROOT%{_libexecdir}
+%__mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{PAROLE_BIN}
+%{__install} -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/%{name}
+
+
 %find_lang %{name}
 %find_lang %{name}
 
 
 desktop-file-install                                    \
 desktop-file-install                                    \
@@ -140,6 +150,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO THANKS
 %doc AUTHORS COPYING README TODO THANKS
+%{PAROLE_BIN}
 %{_bindir}/%{name}
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}-0/
 %dir %{_libdir}/%{name}-0/
 %{_libdir}/%{name}-0/*.so
 %{_libdir}/%{name}-0/*.so
@@ -162,6 +173,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #%endif
 #%endif
 
 
 %changelog
 %changelog
+* Sat May 26 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.0.6-2
+- added Obsoletes tag: %%{name}-mozplugin
+- added wrapper script to detect nonfree package installed
+
 * Fri Sep 30 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.0.6-1
 * Fri Sep 30 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.2.0.6-1
 - new upstream release
 - new upstream release
 - obsoleted -mozplugin package
 - obsoleted -mozplugin package

+ 5 - 2
p/python-crypto/python-crypto-vl.spec

@@ -4,8 +4,8 @@
 Summary:	Cryptography library for Python
 Summary:	Cryptography library for Python
 Summary(ja):	Python 用 Cryptography ライブラリ
 Summary(ja):	Python 用 Cryptography ライブラリ
 Name:		python-crypto
 Name:		python-crypto
-Version:	2.5
-Release:	2%{?_dist_release}
+Version:	2.6
+Release:	1%{?_dist_release}
 License:	Python License (CNRI Python License)
 License:	Python License (CNRI Python License)
 Group:		Development/Libraries
 Group:		Development/Libraries
 URL:		http://www.dlitz.net/software/pycrypto/
 URL:		http://www.dlitz.net/software/pycrypto/
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/
 %{python_sitearch}/
 
 
 %changelog
 %changelog
+* Sat May 26 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.6-1
+- new upstream release
+
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.5-2
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.5-2
 - rebuild with python-2.7.2
 - rebuild with python-2.7.2
 
 

+ 11 - 3
t/transmission/transmission-vl.spec

@@ -1,5 +1,5 @@
 Name:	        transmission
 Name:	        transmission
-Version:	2.51
+Version:	2.52
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 Summary:	A lightweight BitTorrent client
 Summary:	A lightweight BitTorrent client
 Summary(ja):	軽量な BitTorrent クライアント
 Summary(ja):	軽量な BitTorrent クライアント
@@ -9,6 +9,7 @@ License:	MIT and GPLv2
 URL:	        http://www.transmissionbt.com/
 URL:	        http://www.transmissionbt.com/
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.xz
 Source0:        http://download.m0k.org/transmission/files/transmission-%{version}.tar.xz
 Source1:        transmission-daemon-init
 Source1:        transmission-daemon-init
+Patch0:         desktop_fix.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
@@ -152,8 +153,11 @@ exit 0
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-sed -i "s/x-bittorrent;x-scheme-handler\/magnet;/x-bittorrent;/g" \
-        gtk/transmission-gtk.desktop.in
+#sed -i "s/x-bittorrent;x-scheme-handler\/magnet;/x-bittorrent;/g" \
+#        gtk/transmission-gtk.desktop.in
+#sed -i "s/OnlyShowIn=Unity/OnlyShowIn=Unity;/g" \
+#        gtk/transmission-gtk.desktop.in
+%patch0 -p1
 
 
 %build
 %build
 %configure --disable-static --enable-daemon \
 %configure --disable-static --enable-daemon \
@@ -274,6 +278,10 @@ fi
 %{_mandir}/man1/transmission-qt.1*
 %{_mandir}/man1/transmission-qt.1*
 
 
 %changelog
 %changelog
+* Sat May 26 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.52-1
+- new upstream release
+- added patch0 to fix .desktop validate
+
 * Thu Apr 26 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.51-1
 * Thu Apr 26 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.51-1
 - new upstream release
 - new upstream release
 - fixed conditional branch
 - fixed conditional branch