diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..d87f5613ec4234f82f8eaeebc563711f587fdf88 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..f7ce879e514d7bb0484036f41f054b0411a4f537 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/shotwell diff --git a/shotwell-0.28.4.tar.xz b/shotwell-0.28.4.tar.xz deleted file mode 100644 index 859e83eb59df2df43cd549fc9f9146cd58eacacf..0000000000000000000000000000000000000000 Binary files a/shotwell-0.28.4.tar.xz and /dev/null differ diff --git a/shotwell-0.32.10.tar.xz b/shotwell-0.32.10.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..bff9d4f65cdb39870d1f5c8eb4409fae62d9a33e --- /dev/null +++ b/shotwell-0.32.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26e45a61b5431b096ffcd176f115bd07be9a77a68335899542106e19e07f400e +size 35339616 diff --git a/shotwell.spec b/shotwell.spec index b86d2860d1fb7629bafa5927f13a1b6487e3575c..7994f784dc9ea617a74b2b4a73663b425ff0e62b 100644 --- a/shotwell.spec +++ b/shotwell.spec @@ -1,49 +1,46 @@ Name: shotwell -Version: 0.28.4 -Release: 4 +Version: 0.32.10 +Release: 1 Summary: A photo organizer for the GNOME desktop # LGPLv2+ for the code # CC-BY-SA for some of the icons -License: LGPLv2+ and CC-BY-SA-3.0 +License: LGPL-2.1-or-later AND CC-BY-SA-3.0 URL: https://wiki.gnome.org/Apps/Shotwell Source0: https://download.gnome.org/sources/shotwell/0.28/shotwell-%{version}.tar.xz -BuildRequires: vala -BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib >= 0.7.3 -BuildRequires: gettext -BuildRequires: itstool -BuildRequires: pkgconfig(atk) -BuildRequires: pkgconfig(libgdata) -BuildRequires: pkgconfig(gcr-3) -BuildRequires: pkgconfig(gcr-ui-3) -BuildRequires: pkgconfig(gdk-3.0) -BuildRequires: pkgconfig(gdk-x11-3.0) -BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 -BuildRequires: pkgconfig(gexiv2) >= 0.10.4 -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.20 -BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 -BuildRequires: pkgconfig(gmodule-2.0) >= 2.24.0 -BuildRequires: pkgconfig(gnome-doc-utils) -BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.0 -BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.0.0 -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0 -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 -BuildRequires: pkgconfig(gudev-1.0) >= 145 -BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(libexif) >= 0.6.16 -BuildRequires: pkgconfig(libgphoto2) >= 2.5.0 -BuildRequires: pkgconfig(libraw) >= 0.13.2 -BuildRequires: pkgconfig(libsoup-2.4) >= 2.42.0 -BuildRequires: pkgconfig(libxml-2.0) >= 2.6.32 -BuildRequires: pkgconfig(sqlite3) >= 3.5.9 -BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.6.3 - -# Needed by the publishing plugins -BuildRequires: pkgconfig(rest-0.7) >= 0.7 -BuildRequires: libstdc++ libstdc++-devel +BuildRequires: meson >= 0.59.0 +BuildRequires: vala +BuildRequires: gettext +BuildRequires: itstool +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(gcr-3) +BuildRequires: pkgconfig(gcr-ui-3) +BuildRequires: pkgconfig(gdk-3.0) >= 3.22 +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 +BuildRequires: pkgconfig(gexiv2) >= 0.12.3 +BuildRequires: pkgconfig(gio-2.0) >= 2.40 +BuildRequires: pkgconfig(gmodule-2.0) >= 2.40 +BuildRequires: pkgconfig(gstreamer-1.0) >= 1.20 +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= 1.20 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 +BuildRequires: pkgconfig(gudev-1.0) >= 145 +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(libexif) >= 0.6.16 +BuildRequires: pkgconfig(libgphoto2) >= 2.5.0 +BuildRequires: pkgconfig(libraw) >= 0.13.2 +BuildRequires: pkgconfig(libportal) >= 0.5 +BuildRequires: pkgconfig(libportal-gtk3) >= 0.5 +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libsoup-3.0) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libwebpdemux) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(sqlite3) >= 3.5.9 +BuildRequires: /usr/bin/glib-compile-schemas +BuildRequires: /usr/bin/gtk4-update-icon-cache +BuildRequires: /usr/bin/update-desktop-database # used by shotwell-settings-migrator Requires: dconf @@ -60,87 +57,42 @@ making it easy to experiment and correct errors. %prep %setup -q - %build -%configure \ - --disable-schemas-compile \ - --disable-silent-rules \ - --disable-static -# --disable-rpath to configure doesn't seem to work -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -%make_build - +%meson \ + -Dinstall_apport_hook=false \ +%{nil} +%meson_build %install -# otherwise gettext always returns English text regardless of LANGUAGE asked -export LANG=en_US.utf8 -%make_install - -# Remove libtool .la files -find %{buildroot} -name '*.la' -delete - -# Update the screenshot shown in the software center -# -# NOTE: It would be *awesome* if this file was pushed upstream. -# -# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. -# -appstream-util replace-screenshots %{buildroot}%{_datadir}/metainfo/shotwell.appdata.xml \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shotwell/a.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shotwell/b.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shotwell/c.png \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/shotwell/d.png +%meson_install %find_lang %{name} --with-gnome - -%check -desktop-file-validate %{buildroot}%{_datadir}/applications/shotwell.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/shotwell-viewer.desktop - - -%post -/sbin/ldconfig -update-desktop-database &>/dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - -%postun -/sbin/ldconfig -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - - -%posttrans -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - +rm -f %{buildroot}%{_libdir}/libshotwell-*.so %files -f %{name}.lang %license COPYING -%doc README NEWS THANKS AUTHORS +%doc README.md NEWS THANKS AUTHORS %{_bindir}/shotwell %{_libdir}/shotwell %{_libdir}/libshotwell-authenticator.so.* -%exclude %{_libdir}/libshotwell-authenticator.so %{_libdir}/libshotwell-plugin-common.so.* -%exclude %{_libdir}/libshotwell-plugin-common.so +%{_libdir}/libshotwell-plugin-dev-1.0.so.* %{_libexecdir}/shotwell -%{_datadir}/applications/shotwell.desktop -%{_datadir}/applications/shotwell-viewer.desktop -%{_datadir}/metainfo/shotwell.appdata.xml +%{_datadir}/applications/org.gnome.Shotwell.desktop +%{_datadir}/applications/org.gnome.Shotwell.Auth.desktop +%{_datadir}/applications/org.gnome.Shotwell-Viewer.desktop %{_datadir}/glib-2.0/schemas/*.xml -%{_datadir}/icons/hicolor/*/apps/shotwell.png -%{_datadir}/icons/hicolor/symbolic/apps/shotwell-symbolic.svg -%{_mandir}/man1/* - +%{_datadir}/icons/hicolor/*/apps/org.gnome.Shotwell.png +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shotwell-symbolic.svg +%{_metainfodir}/org.gnome.Shotwell.appdata.xml +%{_mandir}/man1/shotwell.1* %changelog +* Sun Jun 08 2025 Funda Wang - 0.32.10-1 +- update to 0.32.10 + * Thu Jul 21 2022 plerks - 0.28.4-4 - specify CC-BY-SA version