ref: refs/heads/master
commit 888d9d677120c19e71383a0ea857398825423453
Author: Jiri Suchomel
Date: Mon Aug 17 10:05:26 2009 +0200
correct spec and changes file
---
.../yast2-webservice-custom-services.changes | 5 +
.../package/yast2-webservice-custom-services.spec | 83 ++++++++++++++++++++
.../package/yast2-webservice-services.changes | 16 ----
.../package/yast2-webservice-services.spec | 83 --------------------
4 files changed, 88 insertions(+), 99 deletions(-)
diff --git a/plugins/custom_services/package/yast2-webservice-custom-services.changes b/plugins/custom_services/package/yast2-webservice-custom-services.changes
new file mode 100644
index 0000000..2a5a99c
--- /dev/null
+++ b/plugins/custom_services/package/yast2-webservice-custom-services.changes
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Mon Aug 17 10:04:46 CEST 2009 - jsuchome@suse.cz
+
+- initial version (based on yast2-webservice-services)
+
diff --git a/plugins/custom_services/package/yast2-webservice-custom-services.spec b/plugins/custom_services/package/yast2-webservice-custom-services.spec
new file mode 100644
index 0000000..14bd55c
--- /dev/null
+++ b/plugins/custom_services/package/yast2-webservice-custom-services.spec
@@ -0,0 +1,83 @@
+#
+# spec file for package yast2-webservice-custom-services (Version 0.1)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name: yast2-webservice-custom-services
+PreReq: yast2-webservice
+Provides: yast2-webservice:/srv/www/yastws/app/controllers/custom_services_controller.rb
+License: MIT
+Group: Productivity/Networking/Web/Utilities
+Autoreqprov: on
+Version: 0.0.1
+Release: 0
+Summary: YaST2 - Webservice - Services
+Source: www.tar.bz2
+Source1: org.opensuse.yast.modules.yapi.services.policy
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+
+#
+%define pkg_user yastws
+%define plugin_name custom_services
+#
+
+
+%description
+YaST2 - Webservice - REST based interface of YaST in order to handle custom services.
+Authors:
+--------
+ Stefan Schubert
+
+%prep
+%setup -q -n www
+
+%build
+
+%install
+
+#
+# Install all web and frontend parts.
+#
+mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
+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/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+#
+# granting all permissions for root
+#
+/etc/yastws/tools/policyKit-rights.rb --user root --action grant >& /dev/null || :
+
+%files
+%defattr(-,root,root)
+%dir /srv/www/%{pkg_user}
+%dir /srv/www/%{pkg_user}/vendor
+%dir /srv/www/%{pkg_user}/vendor/plugins
+%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
+%dir /usr/share/PolicyKit
+%dir /usr/share/PolicyKit/policy
+/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
+/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/init.rb
+/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/install.rb
+/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}/tasks
+#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/test
+%attr(644,root,root) /usr/share/PolicyKit/policy/org.opensuse.yast.system.%{plugin_name}.policy
diff --git a/plugins/custom_services/package/yast2-webservice-services.changes b/plugins/custom_services/package/yast2-webservice-services.changes
deleted file mode 100644
index c1709a4..0000000
--- a/plugins/custom_services/package/yast2-webservice-services.changes
+++ /dev/null
@@ -1,16 +0,0 @@
--------------------------------------------------------------------
-Wed Jun 24 10:40:44 CEST 2009 - mvidner@suse.cz
-
-- /services shows all services, not just fakes (but avoids "halt")
-- /services no longer includes command info, /services/FOO does.
-- /services is now sorted, disable by ?sort=0
-- /commands/update:
- * call /etc/init.d/FOO, /usr/sbin/rcFOO is nonstandard
- * always return exit+stdout+stderr
-- 0.0.3
-
--------------------------------------------------------------------
-Fri Apr 17 11:50:12 CEST 2009 - schubi@suse.de
-
-- splitted off from yast2-webservice
-
diff --git a/plugins/custom_services/package/yast2-webservice-services.spec b/plugins/custom_services/package/yast2-webservice-services.spec
deleted file mode 100644
index 512f2a8..0000000
--- a/plugins/custom_services/package/yast2-webservice-services.spec
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# spec file for package yast2-webservice-services (Version 0.1)
-#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-Name: yast2-webservice-services
-PreReq: yast2-webservice
-Provides: yast2-webservice:/srv/www/yastws/app/controllers/services_controller.rb
-License: MIT
-Group: Productivity/Networking/Web/Utilities
-Autoreqprov: on
-Version: 0.0.3
-Release: 0
-Summary: YaST2 - Webservice - Services
-Source: www.tar.bz2
-Source1: org.opensuse.yast.system.services.policy
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
-
-#
-%define pkg_user yastws
-%define plugin_name services
-#
-
-
-%description
-YaST2 - Webservice - REST based interface of YaST in order to handle services.
-Authors:
---------
- Stefan Schubert
-
-%prep
-%setup -q -n www
-
-%build
-
-%install
-
-#
-# Install all web and frontend parts.
-#
-mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
-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/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-#
-# granting all permissions for root
-#
-/etc/yastws/tools/policyKit-rights.rb --user root --action grant >& /dev/null || :
-
-%files
-%defattr(-,root,root)
-%dir /srv/www/%{pkg_user}
-%dir /srv/www/%{pkg_user}/vendor
-%dir /srv/www/%{pkg_user}/vendor/plugins
-%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}
-%dir /usr/share/PolicyKit
-%dir /usr/share/PolicyKit/policy
-/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
-/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/init.rb
-/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/install.rb
-/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}/tasks
-#/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/test
-%attr(644,root,root) /usr/share/PolicyKit/policy/org.opensuse.yast.system.%{plugin_name}.policy
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Jiri Suchomel