Browse Source

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

kudoh 12 years ago
parent
commit
f44284bf5c

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

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-mako
-Version: 0.5.0
+Version: 0.6.2
 Release: 1%{?_dist_release}
 Summary: Mako template library for Python
 Summary(ja): Python の Mako テンプレートライブラリ
@@ -45,12 +45,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE README doc examples
+%doc CHANGES LICENSE README.rst doc/ examples/
 %{_bindir}/mako-render
 %{python_sitelib}/*
 
 
 %changelog
+* Wed Feb 08 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.2-1
+- new upstream release
+
 * Sat Nov 12 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.0-1
 - new upstream release
 

+ 4 - 1
p/python-pocket-lint/python-pocket-lint-vl.spec

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: python-pocket-lint
-Version: 0.5.27
+Version: 0.5.28
 Release: 1%{?_dist_release}
 Summary: Pocket-lint a composite linter and style checker for source code
 Summary(ja): Pocket-lint はソースコードのコンポジットリンターとスタイルチェッカーです
@@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 08 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.28-1
+- new upstream release
+
 * Thu Feb 02 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.5.27-1
 - new upstream release
 

+ 127 - 14
r/rabbitvcs/rabbitvcs-vl.spec

@@ -6,25 +6,31 @@
 %define build_vine5 1
 %endif
 
+%global title RabbitVCS
+
 Summary:	Integrated Subversion support for Nautilus
 Summary(ja): 	Subversion サポートを Nautilus に追加する拡張
 Name:		rabbitvcs
-Version:	0.14.2.1
+Version:	0.15.0.5
 Release: 	1%{?_dist_release}
-Source0:	http://rabbitvcs.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:	http://rabbitvcs.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:	rabbitvcs-0.14.2.1-ja.po
 Patch1:		rabbitvcs-0.14.1.1-gtk216.patch
 License:	GPL
 Group:		Development/Tools
 URL:		http://rabbitvcs.org/
 
-Requires:	nautilus, pygtk2,  python-configobj
-Requires:	pygobject, pygtk2-libglade
-Requires:	subversion, pysvn, python-simplejson
-BuildRequires:	python-devel, gettext
+#Requires:	nautilus, pygtk2,  python-configobj
+#Requires:	pygobject, pygtk2-libglade
+#Requires:	subversion, pysvn, python-simplejson
+BuildRequires:	gettext
+BuildRequires:	gtk2-devel
+BuildRequires:  pygtk2-devel
+BuildRequires:	python-devel
 Requires(post): gtk2
 Requires(postun): gtk2
 #BuildArch:	noarch
+Obsoletes:      rabbitvcs <= 0.14.2.1
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -53,14 +59,40 @@ RabbitVCS はバージョン管理システムにシンプルかつ直感的に
 Gedit 用のプラグイン、そしてコマンドラインのユーティリティが、
 別パッケージとして提供されています。
 
+
+%package core
+Summary:        Core package of RabbitVCS
+Summary:        RabbitVCS のコアパッケージ
+Group:          Development/Tools
+
+Requires:       dbus-python
+Requires:       meld
+Requires:	pygobject
+Requires:       pygtk2
+Requires:       pygtk2-libglade
+Requires:       pysvn
+Requires:       python-configobj
+Requires:       python-dulwich
+Requires:       subversion
+
+Obsoletes:      rabbitvcs <= 0.14.2.1
+BuildArch:      noarch
+
+#Requires:	nautilus, pygtk2,  python-configobj
+#Requires:	pygobject, pygtk2-libglade
+#Requires:	subversion, pysvn, python-simplejson
+
+
+%description core
+Contains packages shared between the RabbitVCS extensions.
+
 %package nautilus
-Summary:	Integrated Subversion support for Nautilus
-Summary(ja): 	Subversion サポートを Nautilus に追加する拡張
+Summary:        Nautilus extension for RabbitVCS
+Summary(ja): 	RabbitVCS の Nautilus 拡張
 Group:		Development/Tools
 Requires:	nautilus >= 2.22.0
 Requires:	nautilus-python >= 0.7.0
-Requires:	dbus-python > 0.80
-Requires:	rabbitvcs >= %{version}-%{release}
+Requires:	rabbitvcs-core = %{version}-%{release}
 Obsoletes:	nautilussvn
 
 %description nautilus
@@ -78,6 +110,42 @@ RabbitVCS はバージョン管理システムにシンプルかつ直感的に
 統合された形でバージョン管理システムにアクセスできるようになり
 ます。
 
+%package thunar
+Summary:        Thunar extension for RabbitVCS
+Summary(ja):    RabbitVCS の Thunar 拡張
+Group:          Development/Tools
+Requires:	rabbitvcs-core = %{version}-%{release}
+Requires:       Thunar >= 0.4.0
+Requires:       thunarx-python >= 0.2.0
+
+%description thunar
+An extension for Thunar to allow better integration with the 
+Subversion source control system.
+
+%package gedit
+Summary:        Gedit extension for RabbitVCS
+Summary(ja):    RabbitVCS の Gedit 拡張
+Group:          Development/Tools
+Requires:	rabbitvcs-core = %{version}-%{release}
+Requires:       gedit
+
+%description gedit
+RabbitVCS is a set of graphical tools written to provide simple and 
+straightforward access to the version control systems you use. This is the 
+extension for gedit text editor
+
+%package cli
+Summary:        CLI extension for RabbitVCS
+Summary(ja):    RabbitVCS の CLI 拡張
+Group:          Development/Tools
+Requires:	rabbitvcs-core = %{version}-%{release}
+BuildArch:      noarch
+
+%description cli
+RabbitVCS is a set of graphical tools written to provide simple and 
+straightforward access to the version control systems you use. This is the 
+extension for command line interface.
+
 
 %prep
 %setup -q
@@ -95,8 +163,26 @@ RabbitVCS はバージョン管理システムにシンプルかつ直感的に
 
 
 # install nautilus client
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
 %{__install} -d -m755 ${RPM_BUILD_ROOT}/%{_libdir}/nautilus/extensions-2.0/python/
 %{__install} -m644 clients/nautilus/RabbitVCS.py ${RPM_BUILD_ROOT}/%{_libdir}/nautilus/extensions-2.0/python/
+%else 
+%{__install} -d -m755 ${RPM_BUILD_ROOT}/%{_datadir}/nautilus-python/extensions/
+%{__install} -m644 clients/nautilus-3.0/RabbitVCS.py ${RPM_BUILD_ROOT}/%{_datadir}/nautilus-python/extensions/
+%endif
+
+# Installing Thunar Extension
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunarx-2/python/
+cp clients/thunar/%{title}.py $RPM_BUILD_ROOT%{_libdir}/thunarx-2/python/%{title}.py
+
+# Installing Gedit Extension
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/
+cp clients/gedit/%{name}-plugin.py $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/%{name}-plugin.py
+cp clients/gedit/%{name}.gedit-plugin $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/%{name}.gedit-plugin
+
+# Installing CLI Extension
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp clients/cli/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 # install updated japanese translation
 msgfmt %{SOURCE1} -o ${RPM_BUILD_ROOT}/%{_localedir}/ja/LC_MESSAGES/RabbitVCS.mo
@@ -117,10 +203,13 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
 fi
 
-%files
-%defattr(-,root,root)
+%files core
+%defattr(-, root, root, -)
 %doc %{_datadir}/doc/%{name}/
-%{_prefix}/lib/python%{pyver}/site-packages/
+#%{_prefix}/lib/python%{pyver}/site-packages/
+%{python_sitelib}/%{name}/
+%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
+%{_datadir}/icons/hicolor/16x16/actions/
 %{_datadir}/icons/hicolor/scalable/actions/
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/icons/hicolor/scalable/apps/%{name}-small.svg
@@ -132,12 +221,36 @@ fi
 #%exclude %{_datadir}/%{name}/rabbitvcs-restart-required.update-notifier
 
 %files nautilus
-%defattr(-,root,root)
+%defattr(-, root, root, -)
 %doc clients/nautilus/README
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
 %{_libdir}/nautilus/extensions-2.0/python/RabbitVCS.py
+%else
+%{_datadir}/nautilus-python/extensions/RabbitVCS.py
+%endif
+
+%files thunar
+%defattr(-, root, root,-)
+%{_libdir}/thunarx-2/python/%{title}.py*
+
+%files gedit
+%defattr(-, root, root,-)
+%{_libdir}/gedit-2/plugins/%{name}-plugin.py*
+%{_libdir}/gedit-2/plugins/%{name}.gedit-plugin
 
+%files cli
+%defattr(-, root, root,-)
+%{_bindir}/%{name}
 
 %changelog
+* Wed Feb 08 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.15.0.5-1
+- new upstream release
+- reorganized rabbitvcs-core, rabbitvcs-nautilus, rabbitvcs-thunar, 
+  rabbitvcs-gedit, rabbitvcs-cli
+- set contitional branch for stable release and VineSeed
+- added Require packages for rabbitvcs-core
+  - added meld, pygobject, python-dulwich
+
 * Sun May 29 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.14.2.1-1
 - new upstream release
 - drop BuildArch: noarch to change installation path for RabbitVCS.py