shotwell-0.23.2-1

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

s/shotwell/shotwell-vl.spec

@@ -1,6 +1,6 @@
 Name:           shotwell
-Version:        0.22.0
+Version:        0.23.2
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Summary:        A photo manager for the GNOME desktop
 Summary(ja):    GNOME デスクトップ向けの写真管理ツール
 
@@ -9,20 +9,15 @@ 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/stable/shotwell-%{version}.tar.xz
-# http://trac.yorba.org/ticket/3379
+# https://bugzilla.gnome.org/show_bug.cgi?id=715578
-Source1:        shotwell-icons.tar.bz2
+Source2:        shotwell.1
-
-# http://redmine.yorba.org/issues/5181
-Patch0:         shotwell-usrmove.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  GConf2-devel
 BuildRequires:  LibRaw-devel
 BuildRequires:  LibRaw-static
-BuildRequires:  WebKit3-gtk-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -46,6 +41,7 @@ BuildRequires:  unique3-devel
 BuildRequires:  vala-devel >= 0.9.5
 BuildRequires:  rest-devel
 BuildRequires:  gnome-doc-utils
+BuildRequires:  webkitgtk4-devel
 
 # used by shotwell-settings-migrator
 Requires: dconf
@@ -67,23 +63,20 @@ Shotwell は GNOME デスクトップ環境用に設計された新しいオー
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .usrmove
 
 %build
-# We can't use the configure macro: it's not a standard autotools configure script
+./configure \
-export CFLAGS="%{optflags}"
+  --prefix=%{_prefix} \
-export LIB=%{_lib}
+  --lib=%{_lib} \
+  --disable-schemas-compile \
+  --disable-icon-update
 
-# HACK: Remove fatal-warnings to succeed build with vala 0.13.
+#make %{?_smp_mflags}
-#sed -i "s:--fatal-warnings ::g" Makefile plugins/Makefile.plugin.mk
+make
-./configure --prefix=%{_prefix} --lib=%{_lib} --disable-schemas-install 
-#sed -i -e 's/\\n/\n/g' configure.mk
-make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export XDG_DISABLE_MAKEFILE_UPDATES=1
 # otherwise gettext always returns English text regardless of LANGUAGE asked
 export LANG=en_US.utf8
@@ -92,12 +85,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.desktop
 
-# put hi-res icons in place
+# install man page
-(
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-  cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
-  rm -rf 16x16 24x24 scalable
-  tar xf %{SOURCE1}
-)
 
 %find_lang %{name} --all-name
 
@@ -122,25 +112,28 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
+%license COPYING
+%doc README MAINTAINERS NEWS THANKS AUTHORS
 %{_bindir}/shotwell
-%{_libexecdir}/shotwell/shotwell-settings-migrator
+%{_libdir}/*
-%{_libexecdir}/shotwell/shotwell-video-thumbnailer
+%{_libexecdir}/shotwell
-%{_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}/shotwell
-%{_datadir}/appdata/shotwell.appdata.xml
 %{_datadir}/applications/shotwell.desktop
 %{_datadir}/applications/shotwell-viewer.desktop
-%{_datadir}/icons/hicolor/*
+%{_datadir}/appdata/shotwell.appdata.xml
-%exclude %{_datadir}/icons/hicolor/icon-theme.cache
+%{_datadir}/GConf/gsettings/shotwell.convert
-%exclude %{_datadir}/glib-2.0/schemas/gschemas.compiled
+%{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/icons/hicolor/*/apps/shotwell.png
+%{_datadir}/icons/hicolor/symbolic/apps/shotwell-symbolic.svg
+%{_datadir}/gnome/help/shotwell
+%{_mandir}/man1/*
 
 
 %changelog
+* Wed Jun 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.23.2-1
+- new upstream release.
+- remove %%_smp_mflags: Makefile has wrong dependency(?).
+
 * Tue Nov 03 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.22.0-2
 - rebuild with exiv2-0.25