Author: lslezak
Date: Mon Jul 21 14:07:12 2008
New Revision: 49269
URL: http://svn.opensuse.org/viewcvs/yast?rev=49269&view=rev
Log:
- build fixes
- enable PolicyKit by default
Modified:
branches/tmp/lslezak/workshop/core/Makefile.cvs
branches/tmp/lslezak/workshop/core/agent-resolver/Makefile.am
branches/tmp/lslezak/workshop/core/agent-resolver/policy/Makefile.am
branches/tmp/lslezak/workshop/core/agent-resolver/policy/org.opensuse.yast.resolver.policy
branches/tmp/lslezak/workshop/core/configure.in.in
branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am
branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am
branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc
branches/tmp/lslezak/workshop/core/yast2-core.spec.in
Modified: branches/tmp/lslezak/workshop/core/Makefile.cvs
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/Makefile.cvs?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/Makefile.cvs (original)
+++ branches/tmp/lslezak/workshop/core/Makefile.cvs Mon Jul 21 14:07:12 2008
@@ -7,7 +7,7 @@
PREFIX = /usr
configure: all
- ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) --enable-policykit
+ ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB)
all:
y2tool y2autoconf
Modified: branches/tmp/lslezak/workshop/core/agent-resolver/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/agent-resolver/Makefile.am?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/agent-resolver/Makefile.am (original)
+++ branches/tmp/lslezak/workshop/core/agent-resolver/Makefile.am Mon Jul 21 14:07:12 2008
@@ -1,3 +1,3 @@
# Makefile.am for core/agent-resolver
-SUBDIRS = conf doc src testsuite policy
+SUBDIRS = conf doc src testsuite
Modified: branches/tmp/lslezak/workshop/core/agent-resolver/policy/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/agent-resolver/policy/Makefile.am?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/agent-resolver/policy/Makefile.am (original)
+++ branches/tmp/lslezak/workshop/core/agent-resolver/policy/Makefile.am Mon Jul 21 14:07:12 2008
@@ -1,6 +0,0 @@
-
-if HAVE_POLKIT
- policy_DATA = org.opensuse.yast.resolver.policy
-endif
-
-EXTRA_DIST = org.opensuse.yast.resolver.policy
Modified: branches/tmp/lslezak/workshop/core/agent-resolver/policy/org.opensuse.yast.resolver.policy
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/agent-resolver/policy/org.opensuse.yast.resolver.policy?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/agent-resolver/policy/org.opensuse.yast.resolver.policy (original)
+++ branches/tmp/lslezak/workshop/core/agent-resolver/policy/org.opensuse.yast.resolver.policy Mon Jul 21 14:07:12 2008
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--*-nxml-*-->
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-
-<policyconfig>
- <vendor>Novell, Inc.</vendor>
- http://www.novell.com
-
- <action id="org.opensuse.yast.resolver.domain.read">
- <description>Reading domain</description>
- <message>Reading domain</message>
- <defaults>
- no
- no
- yes
- </defaults>
- </action>
-
- <action id="org.opensuse.yast.resolver.domain.write">
- <description>Writing domain</description>
- <message>Writing domain</message>
- <defaults>
- no
- no
- auth_admin_keep_session
- </defaults>
- </action>
-
-</policyconfig>
Modified: branches/tmp/lslezak/workshop/core/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/configure.in.in?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/configure.in.in (original)
+++ branches/tmp/lslezak/workshop/core/configure.in.in Mon Jul 21 14:07:12 2008
@@ -77,7 +77,7 @@
*) AC_MSG_ERROR(--enable-policykit: Unknwon value ${enableval}) ;;
esac
],
- [policykit=no])
+ [policykit=yes])
if test "x${policykit}" == xyes ; then
PKG_CHECK_MODULES(POLKIT, [ polkit-dbus >= 0.7 ],
@@ -108,8 +108,3 @@
scr/doc/intro_to_scr.html
])
@YAST2-OUTPUT@
-
-echo "<<< $PACKAGE_NAME $VERSION >>>
-
- PolicyKit enabled: $HAVE_POLKIT
-"
Modified: branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am (original)
+++ branches/tmp/lslezak/workshop/core/dbus/SCR_service/Makefile.am Mon Jul 21 14:07:12 2008
@@ -2,6 +2,8 @@
# Makefile.am for dbus/service
#
+EXTRA_DIST=org.opensuse.yast.SCR.service.in org.opensuse.yast.SCR.conf.in
+
AM_CXXFLAGS = -DY2LOG=\"SCR-service\" -DSUSEVERSION=\"${SUSEVERSION}\"
INCLUDES = ${AGENT_INCLUDES}
Modified: branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am (original)
+++ branches/tmp/lslezak/workshop/core/libscr/src/Makefile.am Mon Jul 21 14:07:12 2008
@@ -18,7 +18,7 @@
INCLUDES = \
-I$(srcdir)/../../libycp/src/include \
-I$(srcdir)/../../liby2/src/include \
- -I$(srcdir)/../../liby2dbus/src \
+ -I$(srcdir)/../../liby2dbus/src \
-I$(srcdir)/../../scr/src \
-I$(srcdir)/include \
${Y2UTIL_CFLAGS}
Modified: branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc (original)
+++ branches/tmp/lslezak/workshop/core/libscr/src/SCR.cc Mon Jul 21 14:07:12 2008
@@ -404,7 +404,7 @@
// use std SCR or DBUS SCR?
if (y2dbus)
{
- y2milestone("Y2DBUS is set, using DBUS for SCR access");
+ y2debug("Y2DBUS is set, using DBUS for SCR access");
connection = new DBusConn;
// connect to the system bus
@@ -416,7 +416,7 @@
}
else
{
- y2milestone("Y2DBUS is not set, using embedded SCR");
+ y2debug("Y2DBUS is not set, using embedded SCR");
}
}
Modified: branches/tmp/lslezak/workshop/core/yast2-core.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/yast2-core.spec.in?rev=49269&r1=49268&r2=49269&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/core/yast2-core.spec.in (original)
+++ branches/tmp/lslezak/workshop/core/yast2-core.spec.in Mon Jul 21 14:07:12 2008
@@ -22,6 +22,9 @@
# libycp includes crypto built-ins
BuildRequires: libxcrypt-devel
+# for SCR DBus service
+BuildRequires: dbus-1-devel PolicyKit-devel
+
Summary: -
Requires: perl = %{perl_version}
Provides: liby2util = 2.16.1
@@ -95,6 +98,11 @@
# .packlist
%{perl_vendorarch}/auto/ycp
/var/adm/perl-modules/%name
+# DBus service
+@ybindir@/SCR_dbus_server
+# DBus service config
+/etc/share/dbus-1/system-services/org.opensuse.yast.SCR.service
+/etc/dbus-1/system.d/org.opensuse.yast.SCR.conf
%files devel
%defattr(-,root,root)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
