diff --git a/apper.spec b/apper.spec index 7c51988..d1d4190 100644 --- a/apper.spec +++ b/apper.spec @@ -1,14 +1,14 @@ Name: apper Epoch: 1 -Version: 0.9.2 -Release: 3mamba +Version: 1.0.0 +Release: 1mamba Summary: A KDE interface and plasmoid for PackageKit Group: Graphical Desktop/Applications/Administration Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.kde-apps.org/content/show.php/show.php?content=84745 -Source: http://download.kde.org/stable/apper/%{version}/src/apper-%{version}.tar.xz +Source: https://download.kde.org/stable/apper/%{version}/apper-%{version}.tar.xz Source1: 01-fedora-org.packagekit.updater.js Source2: apper-0.8.0-translations.tar.xz Patch0: apper-0.8.1-plasmoid-fix-icons.patch @@ -16,18 +16,34 @@ Patch1: apper-0.9.1-no-popup-for-background-actions.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: kde-workspace-devel -BuildRequires: kdelibs-devel -BuildRequires: libQtDeclarative +BuildRequires: libappstream-qt-devel BuildRequires: libgcc -BuildRequires: libpackagekitqt4-devel -BuildRequires: libqt4-devel +BuildRequires: libkauth-devel +BuildRequires: libkbookmarks-devel +BuildRequires: libkcodecs-devel +BuildRequires: libkcompletion-devel +BuildRequires: libkconfig-devel +BuildRequires: libkconfigwidgets-devel +BuildRequires: libkcoreaddons-devel +BuildRequires: libkdbusaddons-devel +BuildRequires: libki18n-devel +BuildRequires: libkiconthemes-devel +BuildRequires: libkio-devel +BuildRequires: libkitemviews-devel +BuildRequires: libkjobwidgets-devel +BuildRequires: libknotifications-devel +BuildRequires: libkservice-devel +BuildRequires: libkwidgetsaddons-devel +BuildRequires: libkxmlgui-devel +BuildRequires: libpackagekitqt5-devel +BuildRequires: libplasma-workspace-devel +BuildRequires: libqt5-devel +BuildRequires: libsolid-devel BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END BuildRequires: cmake -BuildRequires: libphonon-devel BuildRequires: automoc4 -Requires: libqt4-sqlite +Requires: libqt5-sqlite Provides: kpackagekit Obsoletes: kpackagekit Provides: packagekitgui @@ -58,109 +74,74 @@ Apper (aka KPackageKit) is the KDE interface for PackageKit. %build #:<< _EOF -%cmake_kde4 -d build +%cmake_kde5 -d build %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -mv %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \ - %{buildroot}%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service.KPackageKit - -mv %{buildroot}%{_kde4_libdir}/apper/libapper.so %{buildroot}%{_kde4_libdir}/libapper.so -rmdir %{buildroot}%{_kde4_libdir}/apper - -## fwik icons are not seached for under /animations -#mv %{buildroot}%{_kde4_datadir}/apper/icons/hicolor/48x48/animations/*.png \ -# %{buildroot}%{_kde4_datadir}/apper/icons/hicolor/48x48/actions/ - -## install icons in system hicolor directory -#install -d -m0755 %{buildroot}%{_kde4_icondir} -#mv %{buildroot}%{_kde4_datadir}/apper/icons/hicolor \ -# %{buildroot}%{_kde4_icondir}/hicolor - -ln -s apper %{buildroot}%{_kde4_bindir}/kpackagekit - -%find_lang %{name} -%find_lang plasma_applet_org.packagekit.updater -cat plasma_applet_org.packagekit.updater.lang >> %{name}.lang +%find_lang %{name}5_qt --with-qt --with-man --all-name || touch %{name}5_qt.lang # update script to integrate packagekit updater plasmoid -install -D -m0644 %{SOURCE1} %{buildroot}%{_kde4_datadir}/plasma-desktop/updates/01-packagekit.updater.js +#install -D -m0644 %{SOURCE1} %{buildroot}%{_kde4_datadir}/plasma-desktop/updates/01-packagekit.updater.js %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%pre +if [ $1 -ge 0 ]; then + [ -L %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service ] && \ + rm -f %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service +fi +: + %post /sbin/ldconfig -touch --no-create %{_kde4_icondir}/hicolor >/dev/null 2>&1 -/usr/sbin/update-alternatives --install %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service org.freedesktop.PackageKit.service %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service.KPackageKit 50 +touch --no-create %{_kde5_icondir}/hicolor >/dev/null 2>&1 +update-desktop-database -q >/dev/null 2>&1 +update-mime-database %{_kde5_mimedir} >/dev/null 2>&1 +gtk-update-icon-cache %{_kde5_icondir}/hicolor >/dev/null 2>&1 exit 0 %preun if [ $1 -eq 0 ]; then /sbin/ldconfig -/usr/sbin/update-alternatives --remove org.freedesktop.PackageKit.service %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service.KPackageKit fi exit 0 %postun if [ $1 -eq 0 ]; then update-desktop-database -q >/dev/null 2>&1 - update-mime-database %{_kde4_mimedir} >/dev/null 2>&1 - touch --no-create %{_kde4_icondir}/hicolor >/dev/null 2>&1 - gtk-update-icon-cache %{_kde4_icondir}/hicolor >/dev/null 2>&1 + update-mime-database %{_kde5_mimedir} >/dev/null 2>&1 + touch --no-create %{_kde5_icondir}/hicolor >/dev/null 2>&1 + gtk-update-icon-cache %{_kde5_icondir}/hicolor >/dev/null 2>&1 fi : -%posttrans -# Fix an upgrade problem: alternatives removed from preun script -if [ $1 -eq 1 ]; then - /usr/sbin/update-alternatives --install %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service org.freedesktop.PackageKit.service %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service.KPackageKit 50 - /usr/sbin/update-alternatives --auto org.freedesktop.PackageKit.service -fi -update-desktop-database -q >/dev/null 2>&1 -update-mime-database %{_kde4_mimedir} >/dev/null 2>&1 -gtk-update-icon-cache %{_kde4_icondir}/hicolor >/dev/null 2>&1 -exit 0 - -%files -f %{name}.lang +%files -f %{name}5_qt.lang %defattr(-,root,root) -%{_kde4_bindir}/apper -%{_kde4_bindir}/kpackagekit -%{_kde4_libdir}/libapper.so -%{_kde4_libdir}/kde4/kcm_apper.so -%{_kde4_libdir}/kde4/kded_apperd.so -%dir %{_kde4_libdir}/kde4/imports/org/kde/apper -%{_kde4_libdir}/kde4/imports/org/kde/apper/libapperplugin.so -%{_kde4_libdir}/kde4/imports/org/kde/apper/qmldir -%{_kde4_libexecdir}/apper-pk-session -%{_kde4_xdgappsdir}/apper.desktop -%{_kde4_xdgappsdir}/apper_installer.desktop -%{_kde4_xdgappsdir}/apper_settings.desktop -%{_kde4_xdgappsdir}/apper_updates.desktop -%{_kde4_sharedir}/appdata/apper.appdata.xml -%{_kde4_datadir}/plasma-desktop/updates/01-packagekit.updater.js -%{_kde4_datadir}/apperd/apperd.notifyrc -#%{_kde4_icondir}/hicolor/* -%{_kde4_datadir}/apper/icons/hicolor/*/actions/*.png -%{_kde4_datadir}/apper/icons/hicolor/*/animations/*.png -%{_kde4_datadir}/apper/icons/hicolor/*/categories/*.png -%dir %{_kde4_datadir}/plasma/plasmoids/org.packagekit.updater -%dir %{_kde4_datadir}/plasma/plasmoids/org.packagekit.updater/contents -%dir %{_kde4_datadir}/plasma/plasmoids/org.packagekit.updater/contents/ui -%{_kde4_datadir}/plasma/plasmoids/org.packagekit.updater/contents/ui/*.qml -%{_kde4_datadir}/plasma/plasmoids/org.packagekit.updater/metadata.desktop -%{_kde4_servicesdir}/plasma-applet-org.packagekit.updater.desktop -%{_kde4_servicesdir}/kcm_apper.desktop -%{_kde4_servicesdir}/kded/apperd.desktop -%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service.KPackageKit +%{_kde5_bindir}/apper +%{_libdir}/apper/libapper_private.so +%{_libdir}/qt5/plugins/kded_apperd.so +%{_libexecdir}/apper-pk-session +%{_datadir}/apper/icons/hicolor/22x22/actions/*.png +%{_datadir}/apper/icons/hicolor/48x48/actions/*.png +%{_datadir}/apper/icons/hicolor/48x48/animations/*.png +%{_datadir}/apper/icons/hicolor/48x48/categories/*.png +%{_datadir}/apperd/apperd.notifyrc +%{_datadir}/applications/org.kde.apper*.desktop +%{_datadir}/metainfo/org.kde.apper.appdata.xml +%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service +%{_datadir}/kservices5/kded/apperd.desktop %{_mandir}/man1/apper.1* %doc COPYING # TODO %changelog +* Thu Mar 15 2018 Silvan Calarco 1.0.0-1mamba +- update to 1.0.0 + * Thu Aug 20 2015 Silvan Calarco 0.9.2-3mamba - try to fix icons by restoring default installation paths inernal to application dir