ref: refs/heads/master
commit 92e21ce73c1f73e8e0b2cadc7fc76fd08aebe50a
Author: Duncan Mac-Vicar P
Date: Tue Aug 25 11:15:38 2009 +0200
fixing packaging. Copy paste errors mostly
---
.../package/yast2-webservice-basesystem.spec | 8 ++++----
.../patches/package/yast2-webservice-patches.spec | 2 +-
.../package/yast2-webservice-services.spec | 10 ++++++----
.../system/package/yast2-webservice-system.spec | 4 ++--
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/plugins/basesystem/package/yast2-webservice-basesystem.spec b/plugins/basesystem/package/yast2-webservice-basesystem.spec
index 3058677..14cfb46 100644
--- a/plugins/basesystem/package/yast2-webservice-basesystem.spec
+++ b/plugins/basesystem/package/yast2-webservice-basesystem.spec
@@ -27,7 +27,7 @@ Requires: yast2-country >= 2.18.9
#
%define pkg_user yastws
-%define plugin_name language
+%define plugin_name basesystem
#
@@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT
%dir /srv/www/%{pkg_user}/vendor/plugins
%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc
-%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/var
+#%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/var
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/MIT-LICENSE
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/README
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/Rakefile
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/uninstall.rb
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config
-/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
+#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/test
-/srv/www/yastws/vendor/plugins/language/doc/README_FOR_APP
+/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc/README_FOR_APP
diff --git a/plugins/patches/package/yast2-webservice-patches.spec b/plugins/patches/package/yast2-webservice-patches.spec
index a4b5acf..75d6064 100644
--- a/plugins/patches/package/yast2-webservice-patches.spec
+++ b/plugins/patches/package/yast2-webservice-patches.spec
@@ -81,5 +81,5 @@ rm -rf $RPM_BUILD_ROOT
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.system.%{plugin_name}.policy
-%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.system.packages..policy
+%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.system.packages.policy
%changelog
diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec
index b777b90..f008eb2 100644
--- a/plugins/services/package/yast2-webservice-services.spec
+++ b/plugins/services/package/yast2-webservice-services.spec
@@ -19,7 +19,7 @@ Version: 0.0.3
Release: 0
Summary: YaST2 - Webservice - Services
Source: www.tar.bz2
-Source1: org.opensuse.yast.system.services.policy
+#Source1: org.opensuse.yast.system.services.policy
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -54,7 +54,7 @@ cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
# Policies
mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/
+#install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -81,7 +81,9 @@ rm -rf $RPM_BUILD_ROOT
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/uninstall.rb
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config
-/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/lib
+#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/lib
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
+/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc/custom_services.yml
+
#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/test
-%attr(644,root,root) /usr/share/PolicyKit/policy/org.opensuse.yast.system.%{plugin_name}.policy
+#%attr(644,root,root) /usr/share/PolicyKit/policy/org.opensuse.yast.system.%{plugin_name}.policy
diff --git a/plugins/system/package/yast2-webservice-system.spec b/plugins/system/package/yast2-webservice-system.spec
index bd57418..25bb247 100644
--- a/plugins/system/package/yast2-webservice-system.spec
+++ b/plugins/system/package/yast2-webservice-system.spec
@@ -82,7 +82,7 @@ polkit-auth --user %{pkg_user} --revoke org.freedesktop.hal.power-management.reb
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/uninstall.rb
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/app
/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config
-/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
-%attr(644,root,root) %config %{_datadir}/PolicyKit/policy/org.opensuse.yast.system.packages.policy
+#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/tasks
+#%attr(644,root,root) %config %{_datadir}/PolicyKit/policy/org.opensuse.yast.system.packages.policy
%changelog
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
