- up to 0.11.0

diff --git a/dbus-glib.patch b/dbus-glib.patch
deleted file mode 100644 (file)
index 270f214..0000000
--- a/dbus-glib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ristretto-0.8.2/src/Makefile.am~   2016-10-11 13:27:44.000000000 +0000
-+++ ristretto-0.8.2/src/Makefile.am    2018-06-10 20:40:50.002019187 +0000
-@@ -23,6 +23,7 @@
-       main.c
- 
- ristretto_CFLAGS = \
-+      $(DBUS_GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(GTHREAD_CFLAGS) \
-@@ -41,6 +42,7 @@
-       -DLOCALEDIR=\"$(localedir)\"
- 
- ristretto_LDADD = \
-+      $(DBUS_GLIB_LIBS) \
-       $(GTK_LIBS) \
-       $(GLIB_LIBS) \
-       $(GTHREAD_LIBS) \

diff --git a/ristretto-desktop.patch b/ristretto-desktop.patch
index 1658ec207d99bc2f776d826e4fb95502a550b081..14d4f3ac29abb45074cf2651649c9f0f8c03a59e 100644 (file)
--- a/ristretto-desktop.patch
+++ b/ristretto-desktop.patch
@@ -1,5 +1,5 @@
---- ristretto-0.0.21/ristretto.desktop.in~     2008-05-24 15:05:39.000000000 +0200
-+++ ristretto-0.0.21/ristretto.desktop.in      2010-05-11 12:39:16.282352288 +0200
+--- ristretto-0.11.0/ristretto.desktop.in~     2020-12-18 10:32:29.000000000 +0000
++++ ristretto-0.11.0/ristretto.desktop.in      2021-06-11 11:47:14.189782667 +0000
 @@ -8,6 +8,6 @@
  Terminal=false
  Type=Application
@@ -7,4 +7,4 @@
 -Categories=GTK;Graphics;Viewer;
 +Categories=X-XFCE;GTK;Graphics;Viewer;
  StartupNotify=true
- MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-ico;image/x-pixmap;image/tiff;
+ MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-pixmap;image/tiff;image/svg+xml;image/x-xpixmap;

diff --git a/ristretto.spec b/ristretto.spec
index 6ec313fd64bb6ce1468be976feeef11c4f8a516d..af5c1dc03aae5d426ec7f19999f514638400c729 100644 (file)
--- a/ristretto.spec
+++ b/ristretto.spec
@@ -1,29 +1,29 @@
 Summary:       Picture-viewer for the Xfce desktop environment
 Summary(pl.UTF-8):     Przeglądarka obrazów dla środowiska Xfce
 Name:          ristretto
-Version:       0.10.0
+Version:       0.11.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Graphics
-Source0:       http://archive.xfce.org/src/apps/ristretto/0.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 4249e14fba78728481d89ce61a8771fc
+Source0:       http://archive.xfce.org/src/apps/ristretto/0.11/%{name}-%{version}.tar.bz2
+# Source0-md5: 134d4a49a98b28ba6e91b862fb9a24cc
 Patch0:                %{name}-desktop.patch
-Patch1:                dbus-glib.patch
 URL:           http://goodies.xfce.org/projects/applications/ristretto/
-BuildRequires: Thunar-devel >= 1.6.6
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: cairo-devel >= 1.8.0
 BuildRequires: dbus-glib-devel >= 0.34
 BuildRequires: gettext-tools
-BuildRequires: glib2-devel >= 1:2.30.0
-BuildRequires: gtk+2-devel >= 2:2.24.0
+BuildRequires: glib2-devel >= 1:2.42.0
+BuildRequires: gtk+3-devel >= 3.22.0
 BuildRequires: intltool >= 0.31
 BuildRequires: libexif-devel >= 0.6.0
-BuildRequires: libxfce4util-devel >= 4.14.0
 BuildRequires: libxfce4ui-devel >= 4.14.0
+BuildRequires: libxfce4util-devel >= 4.14.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: xfce4-dev-tools >= 4.14.0
+BuildRequires: xfconf-devel >= 4.14.0
 Requires(post,postun): desktop-file-utils
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
@@ -40,7 +40,6 @@ Xfce.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -58,9 +57,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ie
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{hy_AM,hy}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{hye,ie,ur_PK}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{hy_AM,hy}
 
 %find_lang %{name}
 
@@ -77,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README.md
 %attr(755,root,root) %{_bindir}/%{name}
 %{_desktopdir}/%{name}.desktop
 %{_datadir}/metainfo/ristretto.appdata.xml