- up to 4.18.0

diff --git a/orage.spec b/orage.spec
index 484752d64a37cf8e523b8735da3b8ebc9f77d6b7..43a7ac82b43dac69415aad599c7da60ea33490cc 100644 (file)
--- a/orage.spec
+++ b/orage.spec
@@ -1,15 +1,15 @@
-%define                xfce_version    4.10.0
+%define                xfce_version    4.16.0
 Summary:       Calendar for Xfce
 Summary(pl.UTF-8):     Kalendarz dla Xfce
 Name:          orage
-Version:       4.12.1
-Release:       4
+Version:       4.18.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://archive.xfce.org/src/apps/orage/4.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 2b7f5d38cb5c6edbcc65d0f52a742e46
+Source0:       https://archive.xfce.org/src/apps/orage/4.18/%{name}-%{version}.tar.bz2
+# Source0-md5: c12765da61022c710bb0d5aab3c9c56f
 Patch0:                libical3.patch
-URL:           http://www.xfce.org/projects/orage
+URL:           https://www.xfce.org/projects/orage
 BuildRequires: dbus-glib-devel
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.12.4
@@ -19,7 +19,7 @@ BuildRequires:        libxfce4ui-devel >= %{xfce_version}
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: xfce4-dev-tools >= 4.14.0
+BuildRequires: xfce4-dev-tools >= %{xfce_version}
 BuildRequires: xfce4-panel-devel >= %{xfce_version}
 Requires:      desktop-file-utils
 Requires:      gtk-update-icon-cache
@@ -41,7 +41,7 @@ zarządzania starymi spotkaniami.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 
 %build
 %configure \
@@ -56,7 +56,9 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # duplicate of ur
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
+# unsupported
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/hy_AM
 
 %find_lang %{name}
 
@@ -72,21 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/globaltime
+%doc AUTHORS NEWS README.md
 %attr(755,root,root) %{_bindir}/orage
-%attr(755,root,root) %{_bindir}/tz_convert
-%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/liborageclock.so
 %{_datadir}/orage
-%{_desktopdir}/globaltime.desktop
-%{_desktopdir}/xfcalendar.desktop
-%{_desktopdir}/xfce-xfcalendar-settings.desktop
-%{_datadir}/dbus-1/services/org.xfce.calendar.service
+%{_desktopdir}/org.xfce.orage.desktop
+%{_desktopdir}/org.xfce.orage-settings.desktop
 %{_datadir}/dbus-1/services/org.xfce.orage.service
-%{_datadir}/xfce4/panel/plugins/xfce4-orageclock-plugin.desktop
-%{_mandir}/man1/globaltime.1*
-%{_mandir}/man1/orage.1*
-%{_mandir}/man1/tz_convert.1*
+%{_datadir}/metainfo/org.xfce.orage.appdata.xml
 %{_iconsdir}/hicolor/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.xpm
 %{_iconsdir}/hicolor/scalable/*/*.svg