ref: refs/heads/master commit 9617ec1c2db08f384e733512e7926d8dc591dcf5 Author: Ladislav Slezak <lslezak@novell.com> Date: Fri Oct 30 08:15:44 2009 +0100 fixed restdoc packaging --- .../package/yast2-webservice-administrator.changes | 6 ++++++ .../package/yast2-webservice-administrator.spec | 11 ++++++----- .../package/yast2-webservice-language.changes | 6 ++++++ .../package/yast2-webservice-language.spec | 10 +++++----- .../package/yast2-webservice-mailsettings.changes | 6 ++++++ .../package/yast2-webservice-mailsettings.spec | 11 ++++++----- .../package/yast2-webservice-network.changes | 6 ++++++ .../network/package/yast2-webservice-network.spec | 8 ++++---- plugins/ntp/package/yast2-webservice-ntp.changes | 6 ++++++ plugins/ntp/package/yast2-webservice-ntp.spec | 10 +++++----- .../package/yast2-webservice-services.changes | 6 ++++++ .../package/yast2-webservice-services.spec | 11 ++++++----- .../system/package/yast2-webservice-system.changes | 6 ++++++ .../system/package/yast2-webservice-system.spec | 11 ++++++----- 14 files changed, 80 insertions(+), 34 deletions(-) diff --git a/plugins/administrator/package/yast2-webservice-administrator.changes b/plugins/administrator/package/yast2-webservice-administrator.changes index 8655be3..4f6445d 100644 --- a/plugins/administrator/package/yast2-webservice-administrator.changes +++ b/plugins/administrator/package/yast2-webservice-administrator.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:03:19 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.7 + +------------------------------------------------------------------- Thu Oct 29 14:41:37 CET 2009 - jsuchome@suse.cz - licence changed to GPL2 diff --git a/plugins/administrator/package/yast2-webservice-administrator.spec b/plugins/administrator/package/yast2-webservice-administrator.spec index f348ae0..c7b46a4 100644 --- a/plugins/administrator/package/yast2-webservice-administrator.spec +++ b/plugins/administrator/package/yast2-webservice-administrator.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/administrator_c License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.6 +Version: 0.0.7 Release: 0 Summary: YaST2 - Webservice - Administrator Source: www.tar.bz2 @@ -51,15 +51,19 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/administrator/restdoc +mkdir -p public/administrator/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %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} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING @@ -67,9 +71,6 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/language/package/yast2-webservice-language.changes b/plugins/language/package/yast2-webservice-language.changes index d681c7a..c7175bc 100644 --- a/plugins/language/package/yast2-webservice-language.changes +++ b/plugins/language/package/yast2-webservice-language.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:03:48 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.8 + +------------------------------------------------------------------- Thu Oct 29 17:32:09 CET 2009 - lslezak@suse.cz - GPLv2 license diff --git a/plugins/language/package/yast2-webservice-language.spec b/plugins/language/package/yast2-webservice-language.spec index cecc100..b5fe2d4 100644 --- a/plugins/language/package/yast2-webservice-language.spec +++ b/plugins/language/package/yast2-webservice-language.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/language_contro License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.7 +Version: 0.0.8 Release: 0 Summary: YaST2 - Webservice - Language Source: www.tar.bz2 @@ -51,10 +51,13 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/%{plugin_name}/restdoc +mkdir -p public/language/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # @@ -64,9 +67,6 @@ 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} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.changes b/plugins/mail_settings/package/yast2-webservice-mailsettings.changes index 3d3804b..f56640c 100644 --- a/plugins/mail_settings/package/yast2-webservice-mailsettings.changes +++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:05 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.6 + +------------------------------------------------------------------- Thu Oct 29 14:50:57 CET 2009 - jsuchome@suse.cz - licence changed to GPL2 diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec index 908fd92..056d75c 100644 --- a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec +++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/mail_settings_c License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.5 +Version: 0.0.6 Release: 0 Summary: YaST2 - Webservice - Mail Settings Source: www.tar.bz2 @@ -61,15 +61,19 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/mail_settings/restdoc +mkdir -p public/mail_settings/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %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} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING @@ -81,9 +85,6 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ mkdir -p $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/ cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/network/package/yast2-webservice-network.changes b/plugins/network/package/yast2-webservice-network.changes index bdf8ca3..7d8a0f3 100644 --- a/plugins/network/package/yast2-webservice-network.changes +++ b/plugins/network/package/yast2-webservice-network.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:20 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.9 + +------------------------------------------------------------------- Thu Oct 29 17:56:16 CET 2009 - lslezak@suse.cz - GPLv2 license diff --git a/plugins/network/package/yast2-webservice-network.spec b/plugins/network/package/yast2-webservice-network.spec index 3ce7b14..74559e1 100644 --- a/plugins/network/package/yast2-webservice-network.spec +++ b/plugins/network/package/yast2-webservice-network.spec @@ -13,7 +13,7 @@ Name: yast2-webservice-network License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.8 +Version: 0.0.9 Release: 0 Summary: YaST2 - Webservice - Network Source: www.tar.bz2 @@ -50,6 +50,9 @@ Authors: export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # @@ -63,9 +66,6 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/ntp/package/yast2-webservice-ntp.changes b/plugins/ntp/package/yast2-webservice-ntp.changes index a3c3d7d..7a60ef7 100644 --- a/plugins/ntp/package/yast2-webservice-ntp.changes +++ b/plugins/ntp/package/yast2-webservice-ntp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:32 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.3 + +------------------------------------------------------------------- Thu Oct 29 17:35:02 CET 2009 - lslezak@suse.cz - GPLv2 license diff --git a/plugins/ntp/package/yast2-webservice-ntp.spec b/plugins/ntp/package/yast2-webservice-ntp.spec index 2fc3d0d..aa0b2b7 100644 --- a/plugins/ntp/package/yast2-webservice-ntp.spec +++ b/plugins/ntp/package/yast2-webservice-ntp.spec @@ -18,7 +18,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/ntp_controller. License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.2 +Version: 0.0.3 Release: 0 Summary: YaST2 - Webservice - NTP Source: www.tar.bz2 @@ -46,10 +46,13 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/ntp/restdoc +mkdir -p public/ntp/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %install # @@ -63,9 +66,6 @@ cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/ mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ cp %{SOURCE2} $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/services/package/yast2-webservice-services.changes b/plugins/services/package/yast2-webservice-services.changes index 791c5c3..2d8eee6 100644 --- a/plugins/services/package/yast2-webservice-services.changes +++ b/plugins/services/package/yast2-webservice-services.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:04:50 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.10 + +------------------------------------------------------------------- Thu Oct 29 14:48:07 CET 2009 - jsuchome@suse.cz - licence changed to GPL2 diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec index 459433d..28ee153 100644 --- a/plugins/services/package/yast2-webservice-services.spec +++ b/plugins/services/package/yast2-webservice-services.spec @@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/services_contro License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.9 +Version: 0.0.10 Release: 0 Summary: YaST2 - Webservice - Services Source: www.tar.bz2 @@ -54,15 +54,19 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/services/restdoc +mkdir -p public/services/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %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} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING @@ -70,9 +74,6 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT diff --git a/plugins/system/package/yast2-webservice-system.changes b/plugins/system/package/yast2-webservice-system.changes index fad5c57..e0d0033 100644 --- a/plugins/system/package/yast2-webservice-system.changes +++ b/plugins/system/package/yast2-webservice-system.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 30 08:05:04 CET 2009 - lslezak@suse.cz + +- fixed restdoc packaging +- 0.0.7 + +------------------------------------------------------------------- Thu Oct 29 17:28:38 CET 2009 - lslezak@suse.cz - GPLv2 license diff --git a/plugins/system/package/yast2-webservice-system.spec b/plugins/system/package/yast2-webservice-system.spec index 121405c..a4199e8 100644 --- a/plugins/system/package/yast2-webservice-system.spec +++ b/plugins/system/package/yast2-webservice-system.spec @@ -17,7 +17,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/system_controll License: GPLv2 Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.6 +Version: 0.0.7 Release: 0 Summary: YaST2 - Webservice - System Source: www.tar.bz2 @@ -44,21 +44,22 @@ Authors: %build # build restdoc documentation -mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/public/system/restdoc +mkdir -p public/system/restdoc export RAILS_PARENT=/srv/www/yastws env LANG=en rake restdoc +# do not package restdoc sources +rm -rf restdoc + %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} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING -# do not package restdoc sources -rm -rf $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/restdoc - %clean rm -rf $RPM_BUILD_ROOT -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org