Browse Source

rebuilt and new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8384 ec354946-7b23-47d6-9f5a-488ba84defc7
kudoh 10 years ago
parent
commit
c6cd00df06
3 changed files with 25 additions and 18 deletions
  1. 14 7
      g/glabels/glabels-vl.spec
  2. 4 1
      g/grsync/grsync-vl.spec
  3. 7 10
      p/python-setuptools/python-setuptools-vl.spec

+ 14 - 7
g/glabels/glabels-vl.spec

@@ -1,6 +1,6 @@
 Name:		glabels
-Version:	3.0.1
-Release:	3%{?_dist_release}
+Version:	3.2.0
+Release:	1%{?_dist_release}
 Summary:	A program for creating labels and business cards for GNOME
 Summary(ja):	GNOME 用のラベルと名刺を作成するためのプログラム
 
@@ -10,7 +10,7 @@ URL:		http://glabels.sf.net
 
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.xz
 
-Patch0: 	glabels-3.0.1-ebook.patch
+#Patch0: 	glabels-3.0.1-ebook.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -32,6 +32,7 @@ BuildRequires:	intltool
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	qrencode-devel
 BuildRequires:	zint-devel
+BuildRequires:	itstool
 
 Requires(post):	desktop-file-utils
 Requires(post):	/sbin/ldconfig
@@ -120,7 +121,7 @@ This package contains the template database for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ebook
+#%patch0 -p1 -b .ebook
 
 sed -i 's/Icon=glabels-3.0.png/Icon=glabels-3.0/g' \
         data/desktop/glabels-3.0.desktop.in
@@ -191,6 +192,7 @@ rm -rf %{buildroot}
 %{_datadir}/glabels-3.0/
 %{_datadir}/icons/hicolor/*/
 %{_datadir}/mime/packages/glabels-3.0.xml
+%{_datadir}/appdata/glabels-3.appdata.xml
 
 %files	devel
 %defattr(-,root,root,-)
@@ -215,7 +217,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 ## Manual ("man") pages are automatically marked as %%doc by RPM. 
 %doc AUTHORS COPYING-DOCS
-%doc %{_datadir}/gnome/help/glabels-3.0/
+%doc %{_datadir}/help/*/glabels-3.0/
 %{_mandir}/man?/glabels-3*
 %{_datadir}/gtk-doc/html/libglabels-3.0/
 %{_datadir}/gtk-doc/html/libglbarcode-3.0/
@@ -227,6 +229,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr 26 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.2.0-1
+- new upstream release
+- deleted Patch0
+- added BuildRequires: itstool
+
 * Sun Oct 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-3
 - add Patch0 (glabels-3.0.1-ebook.patch)
 
@@ -349,7 +356,7 @@ rm -rf %{buildroot}
 * Sat Feb 18 2006 Jef Spaleta <jspaleta@gmail.com> - 2.0.4-2
 - Bump for fe5 rebuild 
 
-* Sat Jan 01 2006 Jef Spaleta <jspaleta@gmail.com> - 2.0.4-1
+* Sun Jan 01 2006 Jef Spaleta <jspaleta@gmail.com> - 2.0.4-1
 - Update to new stable upstream version
 
 * Thu Aug 18 2005 Jef Spaleta <jspaleta@gmail.com> - 2.0.3-3
@@ -358,6 +365,6 @@ rm -rf %{buildroot}
 * Thu Jul 7 2005 Jef Spaleta <jspaleta@gmail.com> - 2.0.3-2
 - use Source0
 
-* Mon Jul 5 2005 Jef Spaleta <jspaleta@gmail.com> - 2.0.3-1
+* Tue Jul 5 2005 Jef Spaleta <jspaleta@gmail.com> - 2.0.3-1
 - Initial fedora extras build
 

+ 4 - 1
g/grsync/grsync-vl.spec

@@ -1,6 +1,6 @@
 Name:           grsync
 Version:        1.2.4
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        A Gtk+ GUI for rsync
 Summary(ja):    rsync の Gtk+ GUI
 
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 26 2014 Toshihahru Kudoh <toshi.kd2@gmail.com> - 1.2.4-2
+- rebuilt with new toolchain
+
 * Sun Jul 14 2013 Toshihahru Kudoh <toshi.kd2@gmail.com> - 1.2.4-1
 - new upstream release
 

+ 7 - 10
p/python-setuptools/python-setuptools-vl.spec

@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c11
-Release:        3%{?_dist_release}
+Version:        3.4.4
+Release:        1%{?_dist_release}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 Summary(ja):     Python パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
 Group:          Development/Tools
 License:        PSFL/ZPL
-URL:            http://peak.telecommunity.com/DevCenter/setuptools
-Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
+URL:            https://pypi.python.org/pypi/setuptools
+Source0:        https://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -16,9 +16,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 BuildRequires:  python-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -33,7 +30,7 @@ setuptools は Python distutils の拡張機能を集めたツールです。
 
 %prep
 %setup -q -n setuptools-%{version}
-find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
+#find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 
 
 %build
@@ -61,8 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Jan 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6c11-3
-- rebuild with VineSeed environment
+* Sat Apr 26 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.4.4-1
+- new upstream release
 
 * Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6c11-2
 - rebuild with python-2.7.2