Browse Source

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

kudoh 12 years ago
parent
commit
ca4a98a6a4
3 changed files with 45 additions and 8 deletions
  1. 11 4
      g/gtest/gtest-vl.spec
  2. 16 1
      q/qcomicbook/qcomicbook-vl.spec
  3. 18 3
      u/uget/uget-vl.spec

+ 11 - 4
g/gtest/gtest-vl.spec

@@ -1,12 +1,13 @@
 Summary:	Google C++ testing framework
 Summary(ja):	Google C++ テスティングフレームワーク
 Name:		gtest
-Version:	1.5.0
-Release:	2%{?_dist_release}
+Version:	1.6.0
+Release:	1%{?_dist_release}
 License:	New BSD
 Group:		Development/Tools
 URL:		http://code.google.com/p/googletest/
-Source0:	http://googletest.googlecode.com/files/%{name}-%{version}.tar.bz2
+Source0:	http://googletest.googlecode.com/files/%{name}-%{version}.tar.xz
+Patch0:         gtest-1.6.0_install.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -33,6 +34,7 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Keep a clean copy of samples.
 cp -pr ./samples ./samples.orig
@@ -82,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc samples
-%{_bindir}/%{name}-config
+#%{_bindir}/%{name}-config
 %{_datadir}/aclocal/%{name}.m4
 %{_libdir}/libgtest.so
 %{_libdir}/libgtest_main.so
@@ -92,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/internal
 
 %changelog
+* Sun Apr 29 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.6.0-1
+- new upstream release
+- changed source archive type to xz
+- added Patch0 from Mandriva
+
 * Wed Sep 29 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.5.0-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 16 - 1
q/qcomicbook/qcomicbook-vl.spec

@@ -2,12 +2,14 @@ Summary:	qt viewer for comic book archives
 Summary(ja): 	漫画本アーカイブ用 qt ビューア
 Name:		qcomicbook
 Version:	0.8.2
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 License:	GPLv2
 Group:		Applications/Graphics
 URL:		http://qcomicbook.linux-projects.net/
 Source0:	http://qcomicbook.linux-projects.net/releases/qcomicbook-%{version}.tar.gz
+Source1:        qcomicbook_ja_JP.ts
 Patch0:         qcomicbook_desktop.patch
+Patch1:         enable_ja_trans.patch
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: desktop-file-utils
@@ -46,10 +48,19 @@ gzip+bzip2 を使用した tar の支援と unace を必要とします。
 
 %prep
 %setup -q
+%{__cp} -f %{SOURCE1} i18n/
+
 %patch0 -p1
+%patch1 -p1
 
 %build
+%ifarch %{ix86}
 export QTDIR=/usr/lib/qt4
+%endif
+%ifarch x86_64
+export QTDIR=/usr/lib64/qt4
+%endif
+
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
 %{__make} %{?_smp_mflags}
 
@@ -83,6 +94,10 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_mandir}/man?/%{name}.1.gz
 
 %changelog
+* Sun Apr 29 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.8.2-2
+- added Source1 and Patch1 to enable Japanese translation
+- set conditional branch for architecture
+
 * Sun Nov 06 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.8.2-1
 - new upstream release
 

+ 18 - 3
u/uget/uget-vl.spec

@@ -1,4 +1,4 @@
-%define _version 1.8.0
+%define _version 1.8.1
 Name:		uget
 Version:	%{_version}
 Release:	1%{?_dist_release}
@@ -13,11 +13,17 @@ Source0:	http://downloads.sourceforge.net/urlget/%{name}-%{_version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:	desktop-file-utils gettext
-BuildRequires:	gtk2-devel => 2.18 glib2-devel => 2.22 openldap-devel
+BuildRequires:	glib2-devel => 2.22 openldap-devel
 BuildRequires:	curl-devel => 7.19.1
 BuildRequires:	perl-XML-Parser
 BuildRequires:	gstreamer-devel libnotify-devel
 
+%if %{?_dist_release} == "vl7"
+BuildRequires:	gtk3-devel
+%else
+BuildRequires:	gtk2-devel => 2.18
+%endif
+
 %description
 Uget is a download manager that using gtk+2 and curl.
 
@@ -25,10 +31,15 @@ Uget is a download manager that using gtk+2 and curl.
 Uget は gtk+2 と curl を用いたダウンロードマネージャです。
 
 %prep
-%setup -q -n %{name}-1.8.0
+%setup -q -n %{name}-1.8.1
 
 %build
+%if %{?_dist_release} == "vl7"
+%configure --disable-plugin-aria2 --enable-appindicator=no --with-gtk3
+%else
 %configure --disable-plugin-aria2 --enable-appindicator=no
+%endif
+
 make -k %{?_smp_mflags}
 
 %install
@@ -66,6 +77,10 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_datadir}/sounds/*
 
 %changelog
+* Sat Apr 28 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.8.1-1
+- new upstream release
+- set conditional branch for VineSeed and other
+
 * Thu Jun 09 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.8.0-1
 - new upstream release
 - added %%configure option --disable-plugin-aria2 --enable-appindicator=no