diff --git a/.gitignore b/.gitignore index 38a15df..5980a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ exo-0.3.107.tar.bz2 /exo-0.12.8.tar.bz2 /exo-0.12.10.tar.bz2 /exo-0.12.11.tar.bz2 +/exo-4.16.0.tar.bz2 diff --git a/exo-0.10.2-default-apps.patch b/exo-0.10.2-default-apps.patch deleted file mode 100644 index a172791..0000000 --- a/exo-0.10.2-default-apps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur exo-0.10.2.orig/exo-helper/helpers/helpers.rc exo-0.10.2/exo-helper/helpers/helpers.rc ---- exo-0.10.2.orig/exo-helper/helpers/helpers.rc 2012-12-27 05:50:31.000000000 -0700 -+++ exo-0.10.2/exo-helper/helpers/helpers.rc 2013-05-17 19:56:07.788708933 -0600 -@@ -4,7 +4,7 @@ - # Copyright (c) 2005-2006 Benedikt Meurer - # - --WebBrowser=firefox --MailReader=thunderbird -+WebBrowser=midori -+MailReader=claws-mail - TerminalEmulator=xfce4-terminal - FileManager=Thunar diff --git a/exo-0.7.2-remove-xfce-category.patch b/exo-0.7.2-remove-xfce-category.patch deleted file mode 100644 index 6a417f4..0000000 --- a/exo-0.7.2-remove-xfce-category.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur exo-0.7.2.orig/exo-helper/exo-preferred-applications.desktop.in exo-0.7.2/exo-helper/exo-preferred-applications.desktop.in ---- exo-0.7.2.orig/exo-helper/exo-preferred-applications.desktop.in 2012-03-28 09:15:15.000000000 -0600 -+++ exo-0.7.2/exo-helper/exo-preferred-applications.desktop.in 2012-04-01 21:19:24.762754983 -0600 -@@ -3,7 +3,7 @@ - Exec=exo-preferred-applications - Icon=preferences-desktop-default-applications - Type=Application --Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; -+Categories=X-XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; - OnlyShowIn=XFCE; - Terminal=false - StartupNotify=true diff --git a/exo.spec b/exo.spec index 5c699d4..5b69101 100644 --- a/exo.spec +++ b/exo.spec @@ -1,16 +1,15 @@ -%global minorversion 0.12 -%global xfceversion 4.14 +%global xfceversion 4.16 Name: exo -Version: 0.12.11 -Release: 3%{?dist} +Version: 4.16.0 +Release: 1%{?dist} Summary: Application library for the Xfce desktop environment # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+ # everything else is LGPLv2+ License: LGPLv2+ and GPLv2+ URL: http://xfce.org/ -Source0: http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 # internet-mail icon taken from GNOME, license is LGPLv3 Source1: internet-mail-24.png @@ -19,25 +18,20 @@ Source2: internet-mail-48.png # replace mailto handler with python version # https://bugzilla.xfce.org/show_bug.cgi?id=9964 Source3: mailtoparse.py -Patch1: exo-0.7.2-remove-xfce-category.patch - -# Set default applications to the ones we use in Fedora -Patch2: exo-0.10.2-default-apps.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: gettext BuildRequires: perl-URI BuildRequires: pkgconfig(glib-2.0) >= 2.24.0 -BuildRequires: pkgconfig(gtk+-2.0) >= 2.20.0 BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion} -BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion} +BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} BuildRequires: libnotify-devel BuildRequires: intltool >= 0.31 BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: gobject-introspection-devel -BuildRequires: make +BuildRequires: make %description Extension library for Xfce, targeted at application development. @@ -54,9 +48,6 @@ Development tools and static libraries and header files for the exo library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 - %build %configure --enable-gtk-doc --disable-static %make_build @@ -64,23 +55,9 @@ Development tools and static libraries and header files for the exo library. %install %make_install -# fix permissions for installed libraries -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/*.so - find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' -chrpath --delete %{buildroot}%{_bindir}/exo-desktop-item-edit -chrpath --delete %{buildroot}%{_bindir}/exo-open -chrpath --delete %{buildroot}%{_libdir}/xfce4/exo-*/exo-helper-* -%if 0%{?el6} - chrpath --delete %{buildroot}%{_libdir}/gio/modules/libexo-module-*.so -%endif - -%find_lang exo-1 - -for file in %{buildroot}/%{_datadir}/applications/%{name}-*.desktop ; do - desktop-file-validate $file -done +%find_lang exo-2 install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/internet-mail.png install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/internet-mail.png @@ -89,38 +66,29 @@ install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/in rm -f %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 -%ldconfig_scriptlets - -%files -f exo-1.lang +%files -f exo-2.lang %license COPYING -%doc AUTHORS ChangeLog NEWS README THANKS -%dir %{_sysconfdir}/xdg/xfce4 -%config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc +%doc AUTHORS ChangeLog NEWS THANKS %{_bindir}/exo-desktop-item-edit %{_bindir}/exo-open -%{_bindir}/exo-preferred-applications -%{_libdir}/libexo-1.so.0 -%{_libdir}/libexo-1.so.0.1.0 %{_libdir}/libexo-2.so.0 %{_libdir}/libexo-2.so.0.1.0 %{_libdir}/xfce4/ -%{_datadir}/xfce4/ -%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/* %{_datadir}/pixmaps/exo %{_mandir}/man1/exo-open.1.* %files devel -%doc TODO %doc %{_datadir}/gtk-doc -%{_bindir}/exo-csource %{_includedir}/exo* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%{_mandir}/man1/exo-csource.1.* %changelog +* Wed Dec 23 2020 Mukundan Ragavan - 4.16.0-1 +- Update to 4.16.0 + * Mon Jul 27 2020 Fedora Release Engineering - 0.12.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a59777e..6943c9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (exo-0.12.11.tar.bz2) = ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533 +SHA512 (exo-4.16.0.tar.bz2) = 8fff640c4a229e77911cf091866f265e1f0d7f0b9274b1a879f46061644dd6aec07ae3f8fc43ac7277429ea98bdde8d0ee010da7ed398cddc7d755fea91b964c