Browse Source

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

kudoh 14 years ago
parent
commit
5e1a731116
2 changed files with 19 additions and 5 deletions
  1. 12 4
      s/shotwell/shotwell-vl.spec
  2. 7 1
      v/vala/vala-vl.spec

+ 12 - 4
s/shotwell/shotwell-vl.spec

@@ -1,5 +1,5 @@
 Name:           shotwell
-Version:        0.7.1
+Version:        0.7.2
 Release:        1%{?_dist_release}
 Summary:        A photo organizer for the GNOME desktop
 Summary(ja):    GNOME デスクトップ向けの画像整理ソフト
@@ -9,8 +9,9 @@ Group:          Applications/Graphics
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-Source0:        http://www.yorba.org/download/shotwell/0.4/shotwell-%{version}.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.7/shotwell-%{version}.tar.bz2
 # svn co svn://svn.yorba.org/shotwell/branches/shotwell-0.4, make dist
+Patch0:         workaround_desktop.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
@@ -29,7 +30,7 @@ BuildRequires:  libgudev1-devel
 BuildRequires:  libgexiv2-devel >= 0.2.0
 BuildRequires:  sqlite3-devel
 BuildRequires:  unique-devel
-BuildRequires:  vala-devel
+BuildRequires:  vala-devel >= 0.9.5
 
 %description
 Shotwell is a new open source photo organizer designed for the GNOME desktop
@@ -44,9 +45,10 @@ Shotwell は GNOME デスクトップ環境用に設計された新しいオー
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
-./configure --prefix=/usr --disable-schemas-install
+./configure --prefix=/usr --disable-schemas-install --assume-pkgs
 sed -i -e 's/\\n/\n/g' configure.mk
 sed -i -e 's/^CFLAGS=.*$/CFLAGS=%{optflags}/' Makefile
 sed -i -e 's|LIB_DIRS=.*$|LIB_DIRS=%{_libdir}|' libraw-config
@@ -108,6 +110,12 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Sep 14 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.7.2-1
+- new upstream release
+- changed source URL
+- added Patch0 to work around desktop file comment
+- changed BuildRequires: vala-devel >= 0.9.5
+
 * Fri Aug 27 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.7.1-1
 - new upstream release
 

+ 7 - 1
v/vala/vala-vl.spec

@@ -4,7 +4,7 @@ Summary:        A modern programming language for GNOME
 Summary:        GNOME 用のモダンなプログラミング言語
 
 Name:           vala
-Version:        0.9.7
+Version:        0.9.8
 Release:        1%{?_dist_release}
 
 Group:          Development/Languages
@@ -72,6 +72,8 @@ from existing C libraries, allowing access from Vala programs.
 Summary:        Documentation for %{name}
 Group:          Documentation
 License:        LGPLv2+
+
+BuildArch:	noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       devhelp
 Provides:       %{name}-docs = %{version}-%{release}
@@ -148,6 +150,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 14 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.9.8-1
+- new upstream release
+- made -doc subpackage noarch
+
 * Sun Aug 22 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.9.7-1
 - new upstream release