|
@@ -1,6 +1,6 @@
|
|
Name: shotwell
|
|
Name: shotwell
|
|
-Version: 0.10.1
|
|
|
|
-Release: 2%{?_dist_release}
|
|
|
|
|
|
+Version: 0.11.2
|
|
|
|
+Release: 1%{?_dist_release}
|
|
Summary: A photo manager for the GNOME desktop
|
|
Summary: A photo manager for the GNOME desktop
|
|
Summary(ja): GNOME デスクトップ向けの写真管理ツール
|
|
Summary(ja): GNOME デスクトップ向けの写真管理ツール
|
|
|
|
|
|
@@ -14,7 +14,8 @@ Source0: http://www.yorba.org/download/shotwell/0.10/shotwell-%{version}.
|
|
# http://trac.yorba.org/ticket/3379
|
|
# http://trac.yorba.org/ticket/3379
|
|
Source1: shotwell-icons.tar.bz2
|
|
Source1: shotwell-icons.tar.bz2
|
|
Source2: shotwell-0.8.1-vine2-ja.po
|
|
Source2: shotwell-0.8.1-vine2-ja.po
|
|
-Patch1: shotwell-0.8.1-vala.patch
|
|
|
|
|
|
+
|
|
|
|
+Patch0: shotwell-0.11.1-vala-0.14.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
@@ -27,6 +28,7 @@ BuildRequires: desktop-file-utils
|
|
BuildRequires: gettext
|
|
BuildRequires: gettext
|
|
BuildRequires: gtk2-devel
|
|
BuildRequires: gtk2-devel
|
|
BuildRequires: gstreamer-devel
|
|
BuildRequires: gstreamer-devel
|
|
|
|
+BuildRequires: gstreamer-plugins-base-devel
|
|
BuildRequires: hal-devel
|
|
BuildRequires: hal-devel
|
|
BuildRequires: json-glib-devel
|
|
BuildRequires: json-glib-devel
|
|
BuildRequires: libexif-devel
|
|
BuildRequires: libexif-devel
|
|
@@ -57,18 +59,23 @@ Shotwell は GNOME デスクトップ環境用に設計された新しいオー
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q -n %{name}-%{version}
|
|
%setup -q -n %{name}-%{version}
|
|
-#%patch0 -p1
|
|
|
|
-#%patch1 -p1
|
|
|
|
|
|
+%patch0 -p1 -b .vala014
|
|
pushd po
|
|
pushd po
|
|
%__rm -f ja.po
|
|
%__rm -f ja.po
|
|
%__cp %{SOURCE2} ja.po
|
|
%__cp %{SOURCE2} ja.po
|
|
popd
|
|
popd
|
|
|
|
|
|
%build
|
|
%build
|
|
-./configure --prefix=%{_prefix} --lib=%{_lib} --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
|
|
|
|
|
|
+# We can't use the configure macro: it's not a standard autotools configure script
|
|
|
|
+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
|
|
|
|
+./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}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
@@ -98,47 +105,43 @@ rm -rf $RPM_BUILD_ROOT
|
|
%post
|
|
%post
|
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
|
update-desktop-database &> /dev/null || :
|
|
update-desktop-database &> /dev/null || :
|
|
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
|
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/shotwell.schemas > /dev/null || :
|
|
|
|
-
|
|
|
|
-%pre
|
|
|
|
-if [ "$1" -gt 1 ]; then
|
|
|
|
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
|
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/shotwell.schemas > /dev/null || :
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-%preun
|
|
|
|
-if [ "$1" -eq 0 ]; then
|
|
|
|
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
|
|
|
- gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/shotwell.schemas > /dev/null || :
|
|
|
|
-fi
|
|
|
|
|
|
|
|
%postun
|
|
%postun
|
|
if [ $1 -eq 0 ] ; then
|
|
if [ $1 -eq 0 ] ; then
|
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
|
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
|
|
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
|
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
fi
|
|
fi
|
|
update-desktop-database &> /dev/null || :
|
|
update-desktop-database &> /dev/null || :
|
|
|
|
|
|
%posttrans
|
|
%posttrans
|
|
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
|
|
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
|
+glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
|
|
%files -f %{name}.lang
|
|
%files -f %{name}.lang
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
|
|
%doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
|
|
-%{_sysconfdir}/gconf/schemas/shotwell.schemas
|
|
|
|
%{_bindir}/shotwell
|
|
%{_bindir}/shotwell
|
|
%{_bindir}/shotwell-video-thumbnailer
|
|
%{_bindir}/shotwell-video-thumbnailer
|
|
%{_libdir}/shotwell/plugins/builtin
|
|
%{_libdir}/shotwell/plugins/builtin
|
|
|
|
+%{_datadir}/GConf/gsettings/shotwell.convert
|
|
|
|
+%{_datadir}/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
|
|
|
|
+%{_datadir}/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
|
|
%{_datadir}/gnome/help/
|
|
%{_datadir}/gnome/help/
|
|
%{_datadir}/shotwell
|
|
%{_datadir}/shotwell
|
|
%{_datadir}/applications/shotwell.desktop
|
|
%{_datadir}/applications/shotwell.desktop
|
|
%{_datadir}/applications/shotwell-viewer.desktop
|
|
%{_datadir}/applications/shotwell-viewer.desktop
|
|
%{_datadir}/icons/hicolor/*
|
|
%{_datadir}/icons/hicolor/*
|
|
%exclude %{_datadir}/icons/hicolor/icon-theme.cache
|
|
%exclude %{_datadir}/icons/hicolor/icon-theme.cache
|
|
|
|
+%exclude %{_datadir}/glib-2.0/schemas/gschemas.compiled
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Sep 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.11.2-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add Patch0 (shotwell-0.11.1-vala-0.14.patch)
|
|
|
|
+- add BuildRequires: gstreamer-plugins-base-devel
|
|
|
|
+
|
|
* Sat Aug 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.10.1-2
|
|
* Sat Aug 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.10.1-2
|
|
- rebuilt with libgexiv2-0.2.2-2
|
|
- rebuilt with libgexiv2-0.2.2-2
|
|
|
|
|