Browse Source

Requieres の追加と、build_vine5 macro の追加

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2070 ec354946-7b23-47d6-9f5a-488ba84defc7
kazutaka 14 years ago
parent
commit
87bee843fe
1 changed files with 19 additions and 10 deletions
  1. 19 10
      d/docky/docky-vl.spec

+ 19 - 10
d/docky/docky-vl.spec

@@ -1,15 +1,21 @@
 %define pyver %(python -c 'import sys;print(sys.version[0:3])')
 %define pysite %{_libdir}/python%{pyver}/site-packages
 
+%define build_vine5 0
+
+%if "%{?_dist_release}" == "vl5"
+%define build_vine5 1
+%endif
+
 Summary:	Dock application for GNOME
 Summary(ja): 	GNOME 向けのドックアプリケーション
 Name:		docky
 Version:	2.0.7
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Source0:	http://launchpad.net/docky/2.0/2.0.5/+download/%{name}-%{version}.tar.gz
 Source1:	docky-2.0.5-ja.po
 Patch1:		docky-2.0.5-clock-date-format.patch
-# Add Patch2 to drop dependency for mono.getoptions (obsolete).
+# Add Patch2 to drop dependency for mono.getoptions (obsoleted from mono-2.8).
 # This patch is taken from https://bugs.launchpad.net/docky/+bug/502650
 # and modified to fit with 2.0.7.
 Patch2:		docky-2.0.7-drop-getoptions.patch
@@ -17,18 +23,15 @@ License:	GPLv3
 Group:		Applications/Accessories
 URL:		http://www.go-docky.com/
 
-# TODO: confirm following dependencies (was required for 2.0.6)
-#   mono(Gnome.Keyring) = 1.0.0.0
-#   mono(ICSharpCode.SharpZipLib) = 2.84.0.0
-#   mono(System.Web) = 2.0.0.0
-#   mono(System.Xml.Linq) = 3.5.0.0
-#   mono(gconf-sharp) = 2.24.0.0
-#   mono(rsvg2-sharp) = 2.18.0.0
+Requires:	gconf-sharp2
+Requires:	gnome-keyring-sharp
+Requires:	mono-web
+Requires:	rsvg2-sharp
 Requires(post):	 desktop-file-utils
 Requires(postun):desktop-file-utils
 BuildRequires:	python
 BuildRequires:	gtk2-devel
-BuildRequires:	GConf2
+BuildRequires:	GConf2-devel
 BuildRequires:	gtk-sharp2-gapi
 BuildRequires:	gconf-sharp2
 BuildRequires:	gtk-sharp2
@@ -62,7 +65,9 @@ Docky はアプリケーションの実行やウィンドウの操作を簡単
 %prep
 %setup -q
 %patch1 -p1 -b .clock-date-format
+%if !%{build_vine5}
 %patch2 -p0 -b .no-getoptions
+%endif
 %{__cp} %{SOURCE1} po/ja.po
 
 
@@ -118,6 +123,10 @@ fi
 
 
 %changelog
+* Wed Oct 13 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 2.0.7-2
+- add build_vine5 conditional macro (don't apply patch2 on Vine 5)
+- add Requires: gconf-sharp2, gnome-keyring-sharp, mono-web, rsvg2-sharp
+
 * Mon Oct 11 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 2.0.7-1
 - new upstream release
 - build with mono-2.8 (VineSeed)