X-Git-Url: http://git.pld-linux.org/?p=packages%2FPackageKit.git;a=blobdiff_plain;f=PackageKit.spec;h=c02ce73cc0c1b6f6ef9205d55c61b27898fcfab9;hp=868ae68e664797adbe22ea20997c53bcd52af950;hb=48178e4e61c151c40c5e4523c36c2a138f9ad8ec;hpb=f13ee663ce7d697c879ccffc93b0ed984ac94ad9

diff --git a/PackageKit.spec b/PackageKit.spec
index 868ae68..c02ce73 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -3,86 +3,96 @@
 #   (details in bash from Fedora Rawhide)
 #
 # Conditional build:
-%bcond_without	qt	# don't build packagekit-qt library
-%bcond_without	doc	# build without docs
-%bcond_without	gir	# gobject introspection, time to time broken
-%bcond_without	poldek	# build Poldek backend
-%bcond_without	smart	# build SMART backend
-%bcond_without	yum	# build YUM backend
-%bcond_with	browser	# build browser plugin (patrys says: it's flawed by concept)
-
-# default backend, configurable at runtime
-%define		backend	poldek
-
+%bcond_without	doc		# build without docs
+%bcond_without	introspection	# gobject introspection, time to time broken
+%bcond_with	alpm		# ALPM (Arch Linux package manager) backend
+%bcond_with	apt		# APT (Debian/Ubuntu) backend using C++ API
+%bcond_with	entropy		# Entropy (Sabayon) backend (Python)
+%bcond_with	hif		# HIF (Fedora/RHEL) backend
+%bcond_with	katja		# Katja (Slackware) backend
+%bcond_with	pisi		# PiSi (Pardus) backend (Python)
+%bcond_without	poldek		# Poldek (PLD) backend
+%bcond_with	portage		# portage (Gentoo) backend (Python)
+%bcond_with	ports		# ports (FreeBSD) backend (Ruby)
+%bcond_with	urpmi		# urpmi (Mandriva/Mageia) backend (Perl)
+%bcond_with	zypp		# ZYPP (openSUSE/SLE) backend
+%bcond_without	python		# Python binding (only for a few backends)
+%bcond_with	browser		# browser plugin (patrys says: it's flawed by concept)
+# python binding is built when building any python binding
+%if %{without entropy} && %{without pisi} && %{without ports}
+%undefine	with_python
+%endif
 Summary:	System daemon that is a D-Bus abstraction layer for package management
 Summary(pl.UTF-8):	Demon systemowy będący warstwą abstrakcji D-Bus do zarządzania pakietami
 Name:		PackageKit
-Version:	0.8.4
-Release:	2
+Version:	1.0.7
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
-Source0:	http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	584932c90e4c0f7c55f2dd8ede1eb400
-Patch1:		%{name}-PLD.patch
-Patch2:		bashism.patch
-Patch3:		smart-at-fix.patch
-Patch4:		%{name}-git.patch
-Patch5:		%{name}-gstreamer.patch
+Source0:	http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
+# Source0-md5:	5d6fc6cdd44354c5b7bab7bb434cab1f
+Patch0:		%{name}-poldek.patch
+Patch1:		%{name}-bashcomp.patch
+Patch2:		%{name}-format.patch
+Patch3:		consolekit-fallback.patch
 URL:		http://www.packagekit.org/
 BuildRequires:	NetworkManager-devel >= 0.6.5
-%if %{with qt}
-BuildRequires:	QtCore-devel >= 4.4.0
-BuildRequires:	QtDBus-devel >= 4.4.0
-BuildRequires:	QtGui-devel >= 4.4.0
-BuildRequires:	QtSql-devel >= 4.4.0
-BuildRequires:	QtXml-devel >= 4.4.0
-%endif
+# pkgconfig(libalpm) >= 8.2.0
+%{?with_alpm:BuildRequires:	alpm-devel >= 4}
+%{?with_hif:BuildRequires:	appstream-glib-devel}
+%{?with_apt:BuildRequires:	apt-devel >= 0.7}
 BuildRequires:	autoconf >= 2.65
-BuildRequires:	automake >= 1.11
-%{?with_qt:BuildRequires:	cppunit-devel}
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	connman-devel
+%{?with_katja:BuildRequires:	curl-devel}
 BuildRequires:	dbus-devel >= 1.2.0
 BuildRequires:	dbus-glib-devel >= 0.76
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	fontconfig-devel
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.22.0
-%{?with_gir:BuildRequires:	gobject-introspection-devel}
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32.0
+%{?with_introspection:BuildRequires:	gobject-introspection-devel >= 0.9.9}
 BuildRequires:	gstreamer-devel >= 1.0.0
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0.0
 BuildRequires:	gtk+2-devel >= 2:2.14.0
 BuildRequires:	gtk+3-devel >= 3.0.0
-%{?with_doc:BuildRequires:	gtk-doc >= 1.9}
+%{?with_doc:BuildRequires:	gtk-doc >= 1.11}
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libarchive-devel
+%{?with_hif:BuildRequires:	libhif-devel >= 0.1.7}
 BuildRequires:	libtool
 BuildRequires:	libxslt-progs
+%{?with_zypp:BuildRequires:	libzypp-devel >= 6.16.0}
 BuildRequires:	pango-devel
 BuildRequires:	pkgconfig
-BuildRequires:	pm-utils
 %{?with_poldek:BuildRequires:	poldek-devel >= 0.30-1.rc6.4}
-BuildRequires:	polkit-devel >= 0.97
-BuildRequires:	python-devel
-%{?with_qt:BuildRequires:	qt4-build >= 4.4.0}
+BuildRequires:	polkit-devel >= 0.98
+%{?with_python:BuildRequires:	python-devel >= 1:2.7}
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	sqlite3-devel
+BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-glib-devel
 BuildRequires:	xz
 %if %{with browser}
 BuildRequires:	cairo-devel
 BuildRequires:	nspr-devel >= 4.8
+BuildRequires:	pango-devel
 BuildRequires:	xulrunner-devel >= 8.0
 %endif
 Requires(post,postun):	shared-mime-info
 Requires:	%{name}-backend
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	ConsoleKit-x11
 Requires:	crondaemon
-Requires:	polkit >= 0.92
+Requires:	polkit >= 0.98
+Suggests:	ConsoleKit-x11
+Obsoletes:	PackageKit-backend-smart
+Obsoletes:	PackageKit-backend-yum
 Obsoletes:	PackageKit-docs < 0.8.4
+Obsoletes:	pm-utils-packagekit
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -99,7 +109,7 @@ zgodnego z wieloma dystrybucjami i architekturami.
 Summary:	packagekit-glib library
 Summary(pl.UTF-8):	Biblioteka packagekit-glib
 Group:		Libraries
-Requires:	glib2 >= 1:2.22.0
+Requires:	glib2 >= 1:2.32.0
 
 %description libs
 packagekit-glib library.
@@ -113,7 +123,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki packagekit-glib
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus-devel >= 1.2.0
-Requires:	glib2-devel >= 1:2.22.0
+Requires:	glib2-devel >= 1:2.32.0
 Requires:	sqlite3-devel
 
 %description devel
@@ -134,93 +144,192 @@ Static packagekit-glib library.
 %description static -l pl.UTF-8
 Statyczna biblioteka packagekit-glib.
 
+%package apidocs
+Summary:	PackageKit library API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki PackageKit
+Group:		Documentation
+Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description apidocs
+PackageKit library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki PackageKit.
+
+%package backend-alpm
+Summary:	PackageKit ALPM backend
+Summary(pl.UTF-8):	Backend PackageKit oparty na bibliotece ALPM
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-backend = %{version}-%{release}
+
+%description backend-alpm
+A backend for PackageKit to enable Arch Linux packages via ALPM
+library.
+
+%description backend-alpm -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów Arch Linuksa poprzez
+bibliotekę ALPM.
+
+%package backend-aptcc
+Summary:	PackageKit APTcc backend
+Summary(pl.UTF-8):	Backend PackageKit APTcc
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-backend = %{version}-%{release}
+
+%description backend-aptcc
+A backend for PackageKit to enable APT support via C++ API.
+
+%description backend-aptcc -l pl.UTF-8
+Backend PackageKit dodający obsługę zarządcy pakietów APT poprzez API
+C++.
+
+%package backend-entropy
+Summary:	PackageKit Entropy backend
+Summary(pl.UTF-8):	Backend PackageKit Entropy
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-packagekit = %{version}-%{release}
+#Requires:	python-entropy
+Provides:	%{name}-backend = %{version}-%{release}
+
+%description backend-entropy
+A backend for PackageKit to enable Sabayon packages support through
+Entropy package manager.
+
+%description backend-entropy -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów dystrybucji Sabayon przy
+użyciu zarządcy pakietów Entropy.
+
+%package backend-hif
+Summary:	PackageKit hif backend
+Summary(pl.UTF-8):	Backend PackageKit oparty na bibliotece hif
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libhif >= 0.1.7
+Provides:	%{name}-backend = %{version}-%{release}
+Obsoletes:	PackageKit-backend-hawkey
+
+%description backend-hif
+A backend for PackageKit to enable RPM packages support via hif
+library (used in Fedora).
+
+%description backend-hif -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów RPM poprzez bibliotekę
+hif (używaną w dystrybucji Fedora).
+
+%package backend-katja
+Summary:	PackageKit Katja backend
+Summary(pl.UTF-8):	Backend PackageKit Katja
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-backend = %{version}-%{release}
+
+%description backend-katja
+Katja backend for PackageKit to enable Slackware repositories support.
+
+%description backend-katja -l pl.UTF-8
+Backend PackageKit Katja dodający obsługę repozytoriów Slackware.
+
+%package backend-pisi
+Summary:	PackageKit PiSi backend
+Summary(pl.UTF-8):	Backend PackageKit PiSi
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-packagekit = %{version}-%{release}
+#Requires:	python-piksemel
+#Requires:	python-pisi
+Provides:	%{name}-backend = %{version}-%{release}
+
+%description backend-pisi
+A backend for PackageKit to enable PiSi packages support. PiSi
+packages are originated in Pardus distribution.
+
+%description backend-pisi -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów PiSi. Pakiety PiSi
+wywodzą się z dystrybucji Pardus.
+
 %package backend-poldek
 Summary:	PackageKit Poldek backend
+Summary(pl.UTF-8):	Backend PackageKit oparty na Poldku
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	poldek >= 0.30-1.rc6.4
-Provides:	%{name}-backend
-Conflicts:	%{name} < 0.6.8-3
+Provides:	%{name}-backend = %{version}-%{release}
 
 %description backend-poldek
-A backend for PackageKit to enable Poldek functionality.
-
-%package backend-smart
-Summary:	PackageKit SMART backend
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	smart
+A backend for PackageKit to enable RPM packages support through Poldek
+- native PLD package manager.
 
-%description backend-smart
-A backend for PackageKit to enable SMART functionality.
+%description backend-poldek -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów RPM poprzez Poldka -
+natywnego zarządcę pakietów dystrybucji PLD.
 
-%package backend-yum
-Summary:	PackageKit YUM backend
+%package backend-portage
+Summary:	PackageKit Portage backend
+Summary(pl.UTF-8):	Backend PackageKit Portage
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	python-packagekit = %{version}-%{release}
-Requires:	yum >= 3.2.19
-Provides:	%{name}-backend
+#Requires:	python-portage
+Provides:	%{name}-backend = %{version}-%{release}
 
-%description backend-yum
-A backend for PackageKit to enable yum functionality.
+%description backend-portage
+A backend for PackageKit to enable Gentoo Portage support.
 
-%package qt2
-Summary:	packagekit-qt2 library
-Summary(pl.UTF-8):	Biblioteka packagekit-qt2
+%description backend-portage -l pl.UTF-8
+Backend PackageKit dodający obsługę systemu Portage dystrybucji
+Gentoo.
+
+%package backend-ports
+Summary:	PackageKit Ports backend
+Summary(pl.UTF-8):	Backend PackageKit Ports
 Group:		Libraries
-Obsoletes:	PackageKit-qt < 0.8.4
-Obsoletes:	qpackagekit < 0.4.0
+Requires:	%{name} = %{version}-%{release}
+#Requires:	ruby-pkgtools
+Provides:	%{name}-backend = %{version}-%{release}
 
-%description qt2
-packagekit-qt2 library.
+%description backend-ports
+A backend for PackageKit to enable FreeBSD Ports support.
 
-%description qt2 -l pl.UTF-8
-Biblioteka packagekit-qt2.
+%description backend-ports -l pl.UTF-8
+Backend PackageKit dodający obsługę portów systemu FreeBSD.
 
-%package qt2-devel
-Summary:	Header files for packagekit-qt2 library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki packagekit-qt2
-Group:		Development/Libraries
-Requires:	%{name}-qt2 = %{version}-%{release}
-Requires:	QtCore-devel >= 4.4.0
-Requires:	QtDBus-devel >= 4.4.0
-Requires:	QtGui-devel >= 4.4.0
-Requires:	QtSql-devel >= 4.4.0
-Requires:	QtXml-devel >= 4.4.0
-Obsoletes:	PackageKit-qt-devel < 0.8.4
-Obsoletes:	qpackagekit-devel < 0.4.0
-
-%description qt2-devel
-Header files for packagekit-qt2 library.
-
-%description qt2-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki packagekit-qt2.
-
-%package qt2-static
-Summary:	Static packagekit-qt2 library
-Summary(pl.UTF-8):	Statyczna biblioteka packagekit-qt2
-Group:		Development/Libraries
-Requires:	%{name}-qt2-devel = %{version}-%{release}
-Obsoletes:	PackageKit-qt-static < 0.8.4
+%package backend-urpmi
+Summary:	PackageKit URPMI backend
+Summary(pl.UTF-8):	Backend PackageKit URPMI
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+#Requires:	perl-URPM
+Provides:	%{name}-backend = %{version}-%{release}
 
-%description qt2-static
-Static packagekit-qt2 library.
+%description backend-urpmi
+A backend for PackageKit to enable RPM packages support through URPMI
+package manager (originated in Mandriva).
 
-%description qt2-static -l pl.UTF-8
-Statyczna biblioteka packagekit-qt2.
+%description backend-urpmi -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów RPM poprzez zarządcę
+URPMI (pochodzącego z dystrybucji Mandriva).
 
-%package apidocs
-Summary:	PackageKit library API documentation
-Summary(pl.UTF-8):	Dokumentacja API biblioteki PackageKit
-Group:		Documentation
-Requires:	gtk-doc-common
+%package backend-zypp
+Summary:	PackageKit Zypp backend
+Summary(pl.UTF-8):	Backend PackageKit Zypp
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libzypp >= 6.16.0
+Provides:	%{name}-backend = %{version}-%{release}
 
-%description apidocs
-PackageKit library API documentation.
+%description backend-zypp
+A backend for PackageKit to enable RPM packages support through Zypp
+library (originated in openSUSE/SLE).
 
-%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki PackageKit.
+%description backend-zypp -l pl.UTF-8
+Backend PackageKit dodający obsługę pakietów RPM poprzez bibliotekę
+Zypp (pochodzącą z dystrybucji openSUSE/SLE).
 
 %package gstreamer-plugin
 Summary:	GStreamer codecs installer
@@ -264,28 +373,21 @@ Moduł GTK+ 3.x pozwala każdej aplikacji używającej pango zainstalować
 brakującą czcionkę ze skonfigurowanych źródeł PackageKit.
 
 %package -n bash-completion-packagekit
-Summary:	bash-completion for PackageKit
-Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla PackageKit
+Summary:	Bash completion for PackageKit console commands
+Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów dla poleceń konsolowych PackageKit
 Group:		Applications/Shells
-Requires:	bash-completion
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion >= 2
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n bash-completion-packagekit
-This package provides bash-completion for PackageKit.
+This package provides bash-completion for PackageKit console commands.
 
 %description -n bash-completion-packagekit -l pl.UTF-8
-Pakiet ten dostarcza bashowe uzupełnianie nazw dla PackageKit.
-
-%package -n pm-utils-packagekit
-Summary:	PackageKit script for pm-utils
-Summary(pl.UTF-8):	Skrypt PackageKit dla pm-utils
-Group:		Applications/System
-Requires:	pm-utils
-
-%description -n pm-utils-packagekit
-PackageKit script for pm-utils.
-
-%description -n pm-utils-packagekit -l pl.UTF-8
-Skrypt PackageKit dla pm-utils.
+Pakiet ten dostarcza bashowe uzupełnianie parametrów dla poleceń
+konsolowych PackageKit.
 
 %package -n python-packagekit
 Summary:	PackageKit Python bindings
@@ -316,11 +418,10 @@ Wtyczka PackageKit do przeglądarek WWW.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p0
-%patch4 -p1
-%patch5 -p1
+%patch3 -p1
 
 %build
 %if %{with doc}
@@ -332,21 +433,29 @@ Wtyczka PackageKit do przeglądarek WWW.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+%{?with_zypp:CPPFLAGS="%{rpmcppflags} -D_RPM_5 -I/usr/include/rpm"}
 %configure \
-	--disable-silent-rules \
-	--disable-dummy \
 	--disable-command-not-found \
-	%{!?with_gir:--disable-introspection} \
+	--disable-dummy \
+	%{!?with_doc:--disable-gtk-doc} \
+	%{!?with_introspection:--disable-introspection} \
+	--disable-silent-rules \
+	--enable-bash-completion=%{bash_compdir} \
+	%{__enable_disable alpm} \
+	%{__enable_disable apt aptcc} \
 	%{__enable_disable browser browser-plugin} \
+	%{__enable_disable entropy} \
+	%{__enable_disable hif} \
+	%{__enable_disable katja} \
+	%{__enable_disable pisi} \
 	%{__enable_disable poldek} \
-	%{__enable_disable smart} \
-	%{__enable_disable yum} \
-	%{__enable_disable dok gtk-doc}\
-	%{__enable_disable qt} \
+	%{__enable_disable portage} \
+	%{__enable_disable ports} \
+	%{__enable_disable urpmi} \
+	%{__enable_disable zypp} \
 	--with-html-dir=%{_gtkdocdir} \
-	--with-default-backend=%{backend} \
-	--with-security-framework=polkit \
-	--with-mozilla-plugin-dir=%{_browserpluginsdir}
+	--with-mozilla-plugin-dir=%{_browserpluginsdir} \
+	--with-security-framework=polkit
 %{__make}
 
 %install
@@ -358,13 +467,9 @@ rm -rf $RPM_BUILD_ROOT
 # use pk-gstreamer-install as codec installer
 ln -s pk-gstreamer-install $RPM_BUILD_ROOT%{_libdir}/gst-install-plugins-helper
 
-install -d $RPM_BUILD_ROOT%{_libdir}/pm-utils/sleep.d
-install -p contrib/pm-utils/95packagekit $RPM_BUILD_ROOT%{_libdir}/pm-utils/sleep.d
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-{2,3}.0/modules/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/libpk_backend_test_*.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/packagekit-plugins/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/test_spawn
 
@@ -372,15 +477,11 @@ install -p contrib/pm-utils/95packagekit $RPM_BUILD_ROOT%{_libdir}/pm-utils/slee
 %{__rm} $RPM_BUILD_ROOT%{_browserpluginsdir}/*.{la,a}
 %endif
 
-%if %{with yum}
-# yumBackend.py can't be compiled (invoked directly), other should be compiled
-%py_comp $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum/yum{Comps,Filter}.py
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/PackageKit/helpers/yum/yumBackend.py[co]
-%endif
-
-# unsupported
+# empty version of bg
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bg_BG
+# empty version of fa (empty as well BTW)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/fa_IR
+# outdated copy of it
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/it_IT
 
 %py_postclean
@@ -399,9 +500,6 @@ rm -rf $RPM_BUILD_ROOT
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post	qt2 -p /sbin/ldconfig
-%postun	qt2 -p /sbin/ldconfig
-
 %post -n browser-plugin-packagekit
 %update_browser_plugins
 
@@ -412,53 +510,31 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HACKING NEWS README TODO
-%attr(755,root,root) %{_bindir}/packagekit-bugreport.sh
+%doc AUTHORS HACKING MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/pkcon
-%attr(755,root,root) %{_bindir}/pkgenpack
 %attr(755,root,root) %{_bindir}/pkmon
-%attr(755,root,root) %{_bindir}/pk-debuginfo-install
 %attr(750,root,root) /etc/cron.daily/packagekit-background.cron
+%attr(755,root,root) %{_libexecdir}/packagekit-direct
+%attr(755,root,root) %{_libexecdir}/packagekitd
+%attr(755,root,root) %{_libexecdir}/pk-offline-update
 %dir %{_libdir}/packagekit-backend
-%dir %{_libdir}/packagekit-plugins
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-check-shared-libraries-in-use.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-clear-firmware-requests.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-clear-system-update.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-no-update-process.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-scan-desktop-files.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-systemd-updates.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-update-check-processes.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin-update-package-cache.so
-%attr(755,root,root) %{_libdir}/packagekit-plugins/libpk_plugin_scripts.so
-%attr(755,root,root) %{_libdir}/packagekitd
-%attr(755,root,root) %{_libdir}/pk-clear-offline-update
-%attr(755,root,root) %{_libdir}/pk-offline-update
-%attr(755,root,root) %{_libdir}/pk-trigger-offline-update
-%attr(755,root,root) %{_sbindir}/pk-device-rebind
 %dir %{_sysconfdir}/PackageKit
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/PackageKit.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/Vendor.conf
-%dir %{_sysconfdir}/PackageKit/events
-%{_sysconfdir}/PackageKit/events/post-transaction.d
-%{_sysconfdir}/PackageKit/events/pre-transaction.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/packagekit-background
 /etc/dbus-1/system.d/org.freedesktop.PackageKit.conf
 %dir %{_datadir}/PackageKit
 %dir %{_datadir}/PackageKit/helpers
 %attr(755,root,root) %{_datadir}/PackageKit/pk-upgrade-distro.sh
 %{_datadir}/polkit-1/actions/org.freedesktop.packagekit.policy
-%{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.xml
+%{_datadir}/polkit-1/rules.d/org.freedesktop.packagekit.rules
 %{_datadir}/dbus-1/system-services/org.freedesktop.PackageKit.service
-%{_datadir}/mime/packages/packagekit-catalog.xml
-%{_datadir}/mime/packages/packagekit-package-list.xml
-%{_datadir}/mime/packages/packagekit-servicepack.xml
 %{_mandir}/man1/pkcon.1*
-%{_mandir}/man1/pk-debuginfo-install.1*
-%{_mandir}/man1/pk-device-rebind.1*
-%{_mandir}/man1/pkgenpack.1*
 %{_mandir}/man1/pkmon.1*
+%{systemdunitdir}/packagekit.service
 %{systemdunitdir}/packagekit-offline-update.service
+%dir %{systemdunitdir}/system-update.target.wants
+%{systemdunitdir}/system-update.target.wants/packagekit-offline-update.service
 %dir /var/cache/PackageKit
 %dir /var/cache/PackageKit/downloads
 %dir /var/lib/PackageKit
@@ -467,85 +543,126 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpackagekit-glib2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpackagekit-glib2.so.16
+%attr(755,root,root) %ghost %{_libdir}/libpackagekit-glib2.so.18
 %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib
-%{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib
+# NOTE: dbus interface xmls are commonly used:
+# - at runtime by packagekitd
+# - for development of applications using PK dbus interface
+%{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.Transaction.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.PackageKit.xml
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpackagekit-glib2.so
 %{_pkgconfigdir}/packagekit-glib2.pc
-%{_pkgconfigdir}/packagekit-plugin.pc
 %dir %{_includedir}/PackageKit
 %{_includedir}/PackageKit/packagekit-glib2
-%{_includedir}/PackageKit/plugin
 %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir
-%{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpackagekit-glib2.a
 
-%if %{with poldek}
-%files backend-poldek
+%files apidocs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_poldek.so
+%{_gtkdocdir}/PackageKit
+
+%if %{with alpm}
+%files backend-alpm
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_alpm.so
+%dir %{_sysconfdir}/PackageKit/alpm.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/alpm.d/groups.list
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/alpm.d/pacman.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/alpm.d/repos.list
 %endif
 
-%if %{with smart}
-%files backend-smart
+%if %{with apt}
+%files backend-aptcc
 %defattr(644,root,root,755)
-%{_libdir}/packagekit-backend/libpk_backend_smart.so
-%dir %{_datadir}/PackageKit/helpers/smart
-%attr(755,root,root) %{_datadir}/PackageKit/helpers/smart/smartBackend.py
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_aptcc.so
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apt/apt.conf.d/20packagekit
+%dir %{_datadir}/PackageKit/helpers/aptcc
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/aptcc/get-distro-upgrade.py
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/aptcc/pkconffile
+%{_datadir}/PackageKit/helpers/aptcc/pkconffile.nodiff
 %endif
 
-%if %{with yum}
-%files backend-yum
+%if %{with entropy}
+%files backend-entropy
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/Yum.conf
-%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_yum.so
-%dir %{_datadir}/PackageKit/helpers/yum
-%{_datadir}/PackageKit/helpers/yum/licenses.txt
-%{_datadir}/PackageKit/helpers/yum/yum-comps-groups.conf
-%attr(755,root,root) %{_datadir}/PackageKit/helpers/yum/yumBackend.py
-%{_datadir}/PackageKit/helpers/yum/yumComps.py[co]
-%{_datadir}/PackageKit/helpers/yum/yumFilter.py[co]
-
-# yum plugin
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
-%{_prefix}/lib/yum-plugins/refresh-packagekit.py
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_entropy.so
+%dir %{_datadir}/PackageKit/helpers/entropy
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/entropy/entropyBackend.py
 %endif
 
-%if %{with qt}
-%files qt2
+%if %{with hif}
+%files backend-hif
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpackagekit-qt2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpackagekit-qt2.so.4
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_hif.so
+%endif
 
-%files qt2-devel
+%if %{with katja}
+%files backend-katja
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpackagekit-qt2.so
-%{_pkgconfigdir}/packagekit-qt2.pc
-%{_includedir}/PackageKit/packagekit-qt2
-%dir %{_libdir}/cmake/packagekit-qt2
-%{_libdir}/cmake/packagekit-qt2/packagekit-qt2-config-version.cmake
-%{_libdir}/cmake/packagekit-qt2/packagekit-qt2-config.cmake
-
-%files qt2-static
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_katja.so
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PackageKit/Katja.conf
+%dir /var/cache/PackageKit/metadata
+%ghost /var/cache/PackageKit/metadata/metadata.db
+%endif
+
+%if %{with pisi}
+%files backend-pisi
 %defattr(644,root,root,755)
-%{_libdir}/libpackagekit-qt2.a
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_pisi.so
+%dir %{_datadir}/PackageKit/helpers/pisi
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/pisi/pisiBackend.py
 %endif
 
-%files apidocs
+%if %{with poldek}
+%files backend-poldek
 %defattr(644,root,root,755)
-%{_gtkdocdir}/PackageKit
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_poldek.so
+%endif
+
+%if %{with portage}
+%files backend-portage
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_portage.so
+%dir %{_datadir}/PackageKit/helpers/portage
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/portage/portageBackend.py
+%endif
+
+%if %{with ports}
+%files backend-ports
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_ports.so
+%dir %{_datadir}/PackageKit/helpers/ports
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/ports/portsBackend.rb
+%{_datadir}/PackageKit/helpers/ports/ruby_packagekit
+%endif
+
+%if %{with urpmi}
+%files backend-urpmi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_urpmi.so
+%dir %{_datadir}/PackageKit/helpers/urpmi
+%attr(755,root,root) %{_datadir}/PackageKit/helpers/urpmi/urpmi-dispatched-backend.pl
+%{_datadir}/PackageKit/helpers/urpmi/perl_packagekit
+%{_datadir}/PackageKit/helpers/urpmi/urpmi_backend
+%endif
+
+%if %{with zypp}
+%files backend-zypp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/packagekit-backend/libpk_backend_zypp.so
+%endif
 
 %files gstreamer-plugin
 %defattr(644,root,root,755)
 %doc contrib/gstreamer-plugin/README
-%attr(755,root,root) %{_libdir}/gst-install-plugins-helper
-%attr(755,root,root) %{_libdir}/pk-gstreamer-install
+%attr(755,root,root) %{_libexecdir}/gst-install-plugins-helper
+%attr(755,root,root) %{_libexecdir}/pk-gstreamer-install
 
 %files gtk-module
 %defattr(644,root,root,755)
@@ -559,16 +676,14 @@ fi
 
 %files -n bash-completion-packagekit
 %defattr(644,root,root,755)
-%{_sysconfdir}/bash_completion.d/pk-completion.bash
-
-%files -n pm-utils-packagekit
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/pm-utils/sleep.d/95packagekit
+%{bash_compdir}/pkcon
 
+%if %{with python}
 %files -n python-packagekit
 %defattr(644,root,root,755)
 %dir %{py_sitescriptdir}/packagekit
 %{py_sitescriptdir}/packagekit/*.py[co]
+%endif
 
 %if %{with browser}
 %files -n browser-plugin-packagekit