|
|
@@ -1,6 +1,6 @@
|
|
|
Name: shotwell
|
|
|
-Version: 0.12.3
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 0.13.1
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Summary: A photo manager for the GNOME desktop
|
|
|
Summary(ja): GNOME デスクトップ向けの写真管理ツール
|
|
|
|
|
|
@@ -10,10 +10,14 @@ Group: Applications/Graphics
|
|
|
License: LGPLv2+ and CC-BY-SA
|
|
|
URL: http://www.yorba.org/shotwell/
|
|
|
|
|
|
-Source0: http://www.yorba.org/download/shotwell/stable/shotwell-%{version}.tar.bz2
|
|
|
+Source0: http://www.yorba.org/download/shotwell/stable/shotwell-%{version}.tar.xz
|
|
|
# http://trac.yorba.org/ticket/3379
|
|
|
Source1: shotwell-icons.tar.bz2
|
|
|
-#Source2: shotwell-0.8.1-vine2-ja.po
|
|
|
+
|
|
|
+# http://redmine.yorba.org/issues/5181
|
|
|
+Patch0: shotwell-usrmove.patch
|
|
|
+# http://redmine.yorba.org/issues/5548
|
|
|
+Patch1: 0001-Port-to-GStreamer-1.0.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
@@ -25,11 +29,13 @@ BuildRequires: dbus-glib-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
BuildRequires: gettext
|
|
|
BuildRequires: gtk3-devel
|
|
|
-BuildRequires: gstreamer-devel
|
|
|
-BuildRequires: gstreamer-plugins-base-devel
|
|
|
+#BuildRequires: gstreamer-devel
|
|
|
+#BuildRequires: gstreamer-plugins-base-devel
|
|
|
+BuildRequires: gstreamer1-devel
|
|
|
+BuildRequires: gstreamer1-plugins-base-devel
|
|
|
BuildRequires: json-glib-devel
|
|
|
BuildRequires: libexif-devel
|
|
|
-BuildRequires: libgee-devel
|
|
|
+BuildRequires: libgee06-devel
|
|
|
BuildRequires: libgphoto2-devel
|
|
|
BuildRequires: libgudev1-devel
|
|
|
BuildRequires: libgexiv2-devel >= 0.2.0
|
|
|
@@ -41,6 +47,9 @@ BuildRequires: unique3-devel
|
|
|
BuildRequires: vala-devel >= 0.9.5
|
|
|
BuildRequires: rest-devel
|
|
|
|
|
|
+# used by shotwell-settings-migrator
|
|
|
+Requires: dconf
|
|
|
+
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: kudoh
|
|
|
@@ -58,10 +67,8 @@ Shotwell は GNOME デスクトップ環境用に設計された新しいオー
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n %{name}-%{version}
|
|
|
-#pushd po
|
|
|
-#%__rm -f ja.po
|
|
|
-#%__cp %{SOURCE2} ja.po
|
|
|
-#popd
|
|
|
+%patch0 -p1 -b .usrmove
|
|
|
+%patch1 -p1
|
|
|
|
|
|
%build
|
|
|
# We can't use the configure macro: it's not a standard autotools configure script
|
|
|
@@ -69,11 +76,9 @@ export CFLAGS="%{optflags}"
|
|
|
export LIB=%{_lib}
|
|
|
|
|
|
# HACK: Remove fatal-warnings to succeed build with vala 0.13.
|
|
|
-sed -i "s:--fatal-warnings ::g" Makefile plugins/Makefile.plugin.mk
|
|
|
+#sed -i "s:--fatal-warnings ::g" Makefile plugins/Makefile.plugin.mk
|
|
|
./configure --prefix=%{_prefix} --lib=%{_lib} --disable-schemas-install
|
|
|
#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
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
@@ -94,7 +99,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.de
|
|
|
rm -rf 16x16 24x24 scalable
|
|
|
tar xf %{SOURCE1}
|
|
|
)
|
|
|
-
|
|
|
+
|
|
|
%find_lang %{name} --all-name
|
|
|
|
|
|
%clean
|
|
|
@@ -121,6 +126,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
%doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
|
|
|
%{_bindir}/shotwell
|
|
|
%{_bindir}/shotwell-video-thumbnailer
|
|
|
+%{_libexecdir}/shotwell/shotwell-settings-migrator
|
|
|
%{_libdir}/shotwell/plugins/builtin
|
|
|
%{_datadir}/GConf/gsettings/shotwell.convert
|
|
|
%{_datadir}/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
|
|
|
@@ -135,6 +141,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Oct 20 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.13.1-1
|
|
|
+- new upstream release
|
|
|
+- changed archive typr to xz
|
|
|
+- changed BuildRequires: libgee-devel to libgee06-devel
|
|
|
+- changed BuildRequires: gstreamer-devel and gstreamer-plugins-base-devel to
|
|
|
+ gstreamer1-devel and gstreamer1-plugins-base-devel
|
|
|
+- added Requires: dconf
|
|
|
+- added Patch0,1 from Fedora
|
|
|
+
|
|
|
* Sun Jul 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.12.3-2
|
|
|
- rebuild with exiv2-0.23
|
|
|
|
kudoh