New upstream release

This commit is contained in:
Richard Hughes 2012-06-26 08:48:59 +01:00
parent 0b37866828
commit 4321e48be2
4 changed files with 19 additions and 30 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ PackageKit-0.6.7.tar.bz2
/PackageKit-0.6.21.tar.xz
/PackageKit-0.7.2.tar.xz
/PackageKit-0.7.4.tar.xz
/PackageKit-0.8.1.tar.xz

View File

@ -2,8 +2,8 @@
Summary: Package management service
Name: PackageKit
Version: 0.7.4
Release: 8%{?dist}
Version: 0.8.1
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.packagekit.org
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@ -14,22 +14,14 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
# Fedora specific: the yum backend doesn't do time estimation correctly
Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
# Upstreamed: don't perceive all updates as untrusted
Patch2: PackageKit-0.7.4-yum-untrusted.patch
# Upstreamed: fix an obvious off-by-one when parsing the signature
Patch3: 0001-Fix-importing-GPG-signatures.patch
# Upstreamable? allow use of xulrunner2 for browser-plugin support
Patch4: PackageKit-0.7.4-xulrunner2.patch
# Avoid this unneeded dep
Patch5: no-polkit-backend-required.patch
Requires: PackageKit-glib = %{version}-%{release}
Requires: PackageKit-backend
Requires: shared-mime-info
Requires: comps-extras
Requires: systemd
%if 0%{?rhel} == 0
Requires: preupgrade
%endif
@ -64,6 +56,7 @@ BuildRequires: cppunit-devel
BuildRequires: pango-devel
BuildRequires: pm-utils-devel
BuildRequires: fontconfig-devel
BuildRequires: systemd-devel
BuildRequires: gobject-introspection-devel
%if 0%{?rhel} == 0
BuildRequires: zif-devel >= 0.2.5
@ -262,10 +255,7 @@ user to restart the computer or remove and re-insert the device.
%setup -q
%patch0 -p1 -b .fedora
%patch1 -p1 -b .no-time
%patch2 -p1 -b .yum-untrusted
%patch3 -p1 -b .fix-install-signature
%patch4 -p1 -b .xulrunner2
%patch5 -p1 -b .polkit
NOCONFIGURE=1 ./autogen.sh
%build
@ -291,6 +281,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-plugins/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/libpackagekit-action-lookup.la
@ -313,6 +304,7 @@ popd > /dev/null
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
systemctl enable packagekit-offline-update.service &> /dev/null || :
%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
@ -355,6 +347,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_datadir}/mime/packages/packagekit-*.xml
%{_datadir}/PackageKit/pk-upgrade-distro.sh
%{_libexecdir}/packagekitd
%{_libexecdir}/pk-trigger-offline-update
%{_bindir}/pkmon
%{_bindir}/pkcon
%{_bindir}/pkgenpack
@ -368,6 +361,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/packagekit-plugins/*.so
%{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib
%{_datadir}/dbus-1/interfaces/*.xml
/usr/lib/systemd/system/packagekit-offline-update.service
%{_libexecdir}/pk-*offline-update
%{_libdir}/gtk-2.0/modules/libpk-gtk-module.so
%files docs
%defattr(-,root,root,-)
@ -403,12 +399,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%files glib
%defattr(-,root,root,-)
%{_libdir}/libpackagekit-glib2.so.14*
%{_libdir}/*packagekit-glib2.so.*
%{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib
%files qt
%defattr(-,root,root,-)
%{_libdir}/libpackagekit-qt2.so.1*
%{_libdir}/*packagekit-qt*.so.*
%files cron
%defattr(-,root,root,-)
@ -458,8 +454,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%files qt-devel
%defattr(-,root,root,-)
%{_libdir}/libpackagekit-qt2.so
%{_includedir}/PackageKit/packagekit-qt2/
%{_libdir}/libpackagekit-qt*.so
%{_includedir}/PackageKit/packagekit-qt2/*
%{_libdir}/pkgconfig/packagekit-qt2.pc
%{_libdir}/cmake/packagekit-qt2/packagekit-qt2*.cmake
@ -472,6 +468,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/packagekit-plugin.pc
%changelog
* Mon Jun 25 2012 Richard Hughes <rhughes@redhat.com> - 0.8.1-1
- New upstream release
* Thu Jun 07 2012 Matthias Clasen <mclasen@redhat.com> - 0.7.4-8
- Rebuild

View File

@ -1,11 +0,0 @@
diff -up PackageKit-0.7.4/configure.ac.polkit-backend PackageKit-0.7.4/configure.ac
--- PackageKit-0.7.4/configure.ac.polkit-backend 2012-06-07 21:04:41.787300654 -0400
+++ PackageKit-0.7.4/configure.ac 2012-06-07 21:05:00.813300940 -0400
@@ -542,7 +542,6 @@ AC_SUBST(security_framework, "$with_secu
if test x$with_security_framework = xpolkit; then
PKG_CHECK_MODULES(POLKIT, \
- polkit-backend-1 \
polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED)
AC_DEFINE(USE_SECURITY_POLKIT, 1, [if we should use PolicyKit])
elif test x$with_security_framework = xdummy; then

View File

@ -1 +1 @@
8031ed03099cda09e1d0df4f3e95e6d3 PackageKit-0.7.4.tar.xz
6939b904c1b7dd33d1b4f4f9522f8916 PackageKit-0.8.1.tar.xz