136 lines
4.7 KiB
Diff
136 lines
4.7 KiB
Diff
diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in
|
|
index 7d6fca8..3915a5c 100644
|
|
--- a/etc/PackageKit.conf.in
|
|
+++ b/etc/PackageKit.conf.in
|
|
@@ -9,7 +9,7 @@ TransactionLogging=true
|
|
|
|
# Shut down the daemon after this many seconds idle. 0 means don't shutdown.
|
|
# default=300
|
|
-ShutdownTimeout=300
|
|
+ShutdownTimeout=15
|
|
|
|
# Default backend, as chosen in the configure script. This will be used where
|
|
# no --backend="foo" option is given to the daemon.
|
|
diff --git a/data/Makefile.am b/data/Makefile.am
|
|
index 65a0200..59ac17f 100644
|
|
--- a/data/Makefile.am
|
|
+++ b/data/Makefile.am
|
|
@@ -10,21 +10,12 @@ SUBDIRS = \
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = packagekit.pc
|
|
|
|
-cronfiledir = ${SYSCONFDIR}/cron.daily
|
|
-cronfile_DATA = packagekit-background.cron
|
|
-
|
|
-crondatadir = ${SYSCONFDIR}/sysconfig
|
|
-crondata_DATA = packagekit-background
|
|
-
|
|
pmutilsdir = $(libdir)/pm-utils/sleep.d
|
|
pmutils_DATA = 95packagekit
|
|
|
|
dbusdir = ${SYSCONFDIR}/dbus-1/system.d
|
|
dist_dbus_DATA = \
|
|
org.freedesktop.PackageKit.conf \
|
|
- org.freedesktop.PackageKitTestBackend.conf \
|
|
- org.freedesktop.PackageKitYumBackend.conf \
|
|
- org.freedesktop.PackageKitAptBackend.conf \
|
|
$(NULL)
|
|
|
|
servicemaindir = $(DBUS_SERVICES_DIR)
|
|
@@ -33,24 +24,6 @@ servicemain_DATA = $(servicemain_in_files:.service.in=.service)
|
|
$(servicemain_DATA): $(servicemain_in_files) Makefile
|
|
@sed -e "s|\@servicedir\@|$(sbindir)|" -e "s|\@PACKAGEKIT_USER\@|$(PACKAGEKIT_USER)|" $< > $@
|
|
|
|
-serviceyumdir = $(DBUS_SERVICES_DIR)
|
|
-serviceyum_in_files = org.freedesktop.PackageKitYumBackend.service.in
|
|
-serviceyum_DATA = $(serviceyum_in_files:.service.in=.service)
|
|
-$(serviceyum_DATA): $(serviceyum_in_files) Makefile
|
|
- @sed -e "s|\@servicedir\@|$(libexecdir)|" -e "s|\@PK_BACKEND_USER\@|$(PK_BACKEND_USER)|" $< > $@
|
|
-
|
|
-servicetestdir = $(DBUS_SERVICES_DIR)
|
|
-servicetest_in_files = org.freedesktop.PackageKitTestBackend.service.in
|
|
-servicetest_DATA = $(servicetest_in_files:.service.in=.service)
|
|
-$(servicetest_DATA): $(servicetest_in_files) Makefile
|
|
- @sed -e "s|\@servicedir\@|$(libexecdir)|" -e "s|\@PK_BACKEND_USER\@|$(PK_BACKEND_USER)|" $< > $@
|
|
-
|
|
-serviceaptdir = $(DBUS_SERVICES_DIR)
|
|
-serviceapt_in_files = org.freedesktop.PackageKitAptBackend.service.in
|
|
-serviceapt_DATA = $(serviceapt_in_files:.service.in=.service)
|
|
-$(serviceapt_DATA): $(serviceapt_in_files) Makefile
|
|
- @sed -e "s|\@servicedir\@|$(libexecdir)|" -e "s|\@PK_BACKEND_USER\@|$(PK_BACKEND_USER)|" $< > $@
|
|
-
|
|
localcachedir = $(localstatedir)/run/PackageKit
|
|
localcache_DATA = \
|
|
job_count.dat \
|
|
@@ -63,17 +36,9 @@ database_DATA = \
|
|
|
|
EXTRA_DIST = \
|
|
95packagekit \
|
|
- packagekit-background \
|
|
- packagekit-background.cron \
|
|
org.freedesktop.PackageKit.conf.in \
|
|
- org.freedesktop.PackageKitTestBackend.conf.in \
|
|
- org.freedesktop.PackageKitYumBackend.conf.in \
|
|
- org.freedesktop.PackageKitAptBackend.conf.in \
|
|
packagekit.pc.in \
|
|
$(servicemain_in_files) \
|
|
- $(serviceyum_in_files) \
|
|
- $(servicetest_in_files) \
|
|
- $(serviceapt_in_files) \
|
|
$(localcache_DATA) \
|
|
$(database_DATA) \
|
|
$(NULL)
|
|
@@ -83,9 +48,6 @@ clean-local:
|
|
|
|
DISTCLEANFILES = \
|
|
org.freedesktop.PackageKit.service \
|
|
- org.freedesktop.PackageKitTestBackend.service \
|
|
- org.freedesktop.PackageKitYumBackend.service \
|
|
- org.freedesktop.PackageKitAptBackend.service \
|
|
$(NULL)
|
|
|
|
MAINTAINERCLEANFILES = \
|
|
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
|
|
index bd4ba55..5071cf5 100644
|
|
--- a/backends/zypp/zypp-utils.cpp
|
|
+++ b/backends/zypp/zypp-utils.cpp
|
|
@@ -570,6 +570,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force)
|
|
|
|
// look for licenses to confirm
|
|
|
|
+ /*
|
|
zypp::ResPool pool = zypp::ResPool::instance ();
|
|
for (zypp::ResPool::const_iterator it = pool.begin (); it != pool.end (); it++) {
|
|
if (it->status ().isToBeInstalled () && !(it->satSolvable ().lookupStrAttribute (zypp::sat::SolvAttr::eula).empty ())) {
|
|
@@ -591,6 +592,7 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force)
|
|
g_free (eula_id);
|
|
}
|
|
}
|
|
+ */
|
|
|
|
// Perform the installation
|
|
zypp::ZYppCommitPolicy policy;
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f38eec2..cc864da 100755
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -7,7 +7,7 @@ AM_CONFIG_HEADER(config.h)
|
|
|
|
# Should we enable extra stuff automatically?
|
|
# set no for release builds, yes for development builds
|
|
-DEVELOPMENT_RELEASE=yes
|
|
+DEVELOPMENT_RELEASE=no
|
|
|
|
# libtool versioning - this applies to libpackagekit
|
|
#
|
|
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
|
|
index acfd88c..a9d1506 100644
|
|
--- a/contrib/Makefile.am
|
|
+++ b/contrib/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-SUBDIRS = udev
|
|
+SUBDIRS =
|
|
|
|
if BACKEND_TYPE_YUM
|
|
SUBDIRS += yum-packagekit
|