8:44 a.m.
client/tools/osad/osad.spec
| 28 +++++-----
schema/spacewalk/common/views/rhn_contact_monitoring.sql
| 2
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/002-rhn_contact_monitoring.sql
| 2
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit b89f71f33e78d518dbf9793ed5520a1ffac148e3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 28 14:46:07 2012 +0200
use %global, not %define
http://fedoraproject.org/wiki/Packaging:Guidelines#.25global_preferred_ov...
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 55bab6e..ce590df 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -1,13 +1,13 @@
-%define rhnroot /usr/share/rhn
-%define rhnconf /etc/sysconfig/rhn
-%define client_caps_dir /etc/sysconfig/rhn/clientCaps.d
+%global rhnroot /usr/share/rhn
+%global rhnconf /etc/sysconfig/rhn
+%global client_caps_dir /etc/sysconfig/rhn/clientCaps.d
%if 0%{?suse_version}
-%define apache_group www
-%define include_selinux_package 0
+%global apache_group www
+%global include_selinux_package 0
%else
-%define apache_group apache
-%define include_selinux_package 1
+%global apache_group apache
+%global include_selinux_package 1
%endif
Name: osad
@@ -81,12 +81,12 @@ that message is transported via jabber protocol to OSAD agent on the
clients.
%if 0%{?include_selinux_package}
%package -n osa-dispatcher-selinux
-%define selinux_variants mls strict targeted
-%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,'
/usr/share/selinux/devel/policyhelp 2> /dev/null)
-%define POLICYCOREUTILSVER 1.33.12-1
+%global selinux_variants mls strict targeted
+%global selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,'
/usr/share/selinux/devel/policyhelp 2> /dev/null)
+%global POLICYCOREUTILSVER 1.33.12-1
-%define moduletype apps
-%define modulename osa-dispatcher
+%global moduletype apps
+%global modulename osa-dispatcher
Summary: SELinux policy module supporting osa-dispatcher
Group: System Environment/Base
commit 105753ced0dcf16ba5462729d00fa0e7dc08dab6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 28 14:41:46 2012 +0200
A fast way to force the preferred_time_zone to be string.
inspired by commit 31feee42954c37dce79675a729b9d02491fac0a8
addresing error during pg_restore: unkown type of column preferred_time_zone
diff --git a/schema/spacewalk/common/views/rhn_contact_monitoring.sql
b/schema/spacewalk/common/views/rhn_contact_monitoring.sql
index 46d4ab8..89770dd 100644
--- a/schema/spacewalk/common/views/rhn_contact_monitoring.sql
+++ b/schema/spacewalk/common/views/rhn_contact_monitoring.sql
@@ -26,7 +26,7 @@ select u.id as recid,
u.login as username,
u.password as password,
1 as schedule_id,
- 'GMT' as preferred_time_zone
+ 'GMT' || '' as preferred_time_zone
from
web_user_personal_info wupi,
web_contact u
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/002-rhn_contact_monitoring.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/002-rhn_contact_monitoring.sql
index dd3d066..4152a74 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/002-rhn_contact_monitoring.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/002-rhn_contact_monitoring.sql
@@ -8,7 +8,7 @@ select u.id as recid,
u.login as username,
u.password as password,
1 as schedule_id,
- 'GMT' as preferred_time_zone
+ 'GMT' || '' as preferred_time_zone
from
web_user_personal_info wupi,
web_contact u
commit 257a8d7f589bea15631cd7ba6e7d33f29d0f3278
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 28 14:38:50 2012 +0200
osad.src:477: W: macro-in-%changelog %descriptions
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 3cbd409..55bab6e 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -474,7 +474,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
- make osa-dispatcher start after jabberd
* Mon Jun 21 2010 Jan Pazdziora 5.9.35-1
-- Some spell checking in %descriptions.
+- Some spell checking in %%descriptions.
- OSAD stands for Open Source Architecture Daemon.
* Tue May 04 2010 Jan Pazdziora 5.9.34-1
commit 44e963f5f3d4c6526b173a7c2a3525dc507fcd3c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 28 14:38:23 2012 +0200
osad.src:154: W: macro-in-comment %post
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 87cad97..3cbd409 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -151,7 +151,7 @@ install -p -m 644 osa-dispatcher-selinux/%{modulename}.if \
# Hardlink identical policy module packages together
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
-# Install osa-dispatcher-selinux-enable which will be called in %post
+# Install osa-dispatcher-selinux-enable which will be called in %%post
install -d %{buildroot}%{_sbindir}
install -p -m 755 osa-dispatcher-selinux/osa-dispatcher-selinux-enable
%{buildroot}%{_sbindir}/osa-dispatcher-selinux-enable
%endif