rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b7b6cf4b55d0f3343d08d255f23039f9a6e2f514
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 14:32:25 2009 +0200
Automatic commit of package [spacewalk-web] release [0.7.3-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 6a48378..a972dc5 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.7.2-1 web/
+0.7.3-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 9976f09..eaad9b5 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.3-1
+- 488431 - don't report high usage on UNDO
+
* Fri Aug 28 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.2-1
- awk | sed | sed is rarely needed
- use spacewalk-cfg-get instead of awk
14 years, 8 months
2 commits - web/modules
by Michael Mraka
web/modules/dobby/scripts/check-oracle-space-usage.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit d626641cef6324e0dbd6c870e6a5ddcc38c2b3a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 14:25:10 2009 +0200
run db-control report only once
diff --git a/web/modules/dobby/scripts/check-oracle-space-usage.sh b/web/modules/dobby/scripts/check-oracle-space-usage.sh
index 8600a37..71285d4 100755
--- a/web/modules/dobby/scripts/check-oracle-space-usage.sh
+++ b/web/modules/dobby/scripts/check-oracle-space-usage.sh
@@ -20,6 +20,8 @@ reportusage() {
}
mailitout() {
+ local reportusage=$1
+
#get Satellite email address
MAILADDRESS=$(spacewalk-cfg-get traceback_mail)
@@ -31,17 +33,18 @@ size of the tablespace before getting to 100% usage. Please consult
the Satellite documentation on using db-control to increase the size or
contact Red Hat Support for assistance."
- ( echo $BODY; echo ; reportusage ) | mail -s "$SUBJECT" $MAILADDRESS
+ echo -e "$BODY\n\n$reportusage" | mail -s "$SUBJECT" $MAILADDRESS
exit 0
}
#grab the usage numbers from the db-control report output
-NUMBERS=`reportusage | awk '{if (FNR > 1) {sub("%",""); print $5}}'`
+REPORTUSAGE=$(reportusage)
+NUMBERS=$(echo "$REPORTUSAGE" | awk '{if (FNR > 1) {sub("%",""); print $5}}')
# run db-control and then use awk and sed to get the % numbers
for num in $NUMBERS
do
# if number is over 90% then send warning email
if [ $num -gt 90 ]
- then mailitout
+ then mailitout "$REPORTUSAGE"
fi
done
exit 0
commit 1e9649e6ed001e30f826dfaff9097089e6aed40b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 14:21:41 2009 +0200
488431 - don't report high usage on UNDO
diff --git a/web/modules/dobby/scripts/check-oracle-space-usage.sh b/web/modules/dobby/scripts/check-oracle-space-usage.sh
index f0964c5..8600a37 100755
--- a/web/modules/dobby/scripts/check-oracle-space-usage.sh
+++ b/web/modules/dobby/scripts/check-oracle-space-usage.sh
@@ -15,7 +15,8 @@ PATH=/usr/bin:/bin
export PATH
reportusage() {
- /sbin/runuser oracle -c "db-control report"
+ # don't report UNDO usage
+ /sbin/runuser oracle -c "db-control report" | grep -v UNDO
}
mailitout() {
14 years, 8 months
Changes to 'refs/tags/rhn-client-tools-0.7.1-1'
by Miroslav Suchý
Tag 'rhn-client-tools-0.7.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-09-01 12:18 +0000
Tagging package [rhn-client-tools] version [0.7.1-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-0.7.3-1:
Miroslav Suchý (4):
change appeareance of icon and put it to Administration rather then to Preferences
add scriplet to refres icon cache
move "Requires: yum-rhn-plugin" from rhn-client-tools to rhn-check
Automatic commit of package [rhn-client-tools] release [0.7.1-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 20 ++++++++++++++++++--
client/rhel/rhn-client-tools/rhn_register.desktop | 6 +++---
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 22 insertions(+), 6 deletions(-)
---
14 years, 8 months
4 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 20 ++++++++++++++++++--
client/rhel/rhn-client-tools/rhn_register.desktop | 6 +++---
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit 64e1bd4e1bd34263a13860084c4c6ccf6abd0ea3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 1 14:18:30 2009 +0200
Automatic commit of package [rhn-client-tools] release [0.7.1-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index aed48cd..a03b710 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -215,6 +215,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Tue Sep 1 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
+- change appeareance of icon and put it to Administration rather then to Preferences
+- add scriplet to refres icon cache
+- move "Requires: yum-rhn-plugin" from rhn-client-tools to rhn-check
+
* Wed Aug 05 2009 John Matthews <jmatthew(a)redhat.com> 0.6.2-1
- 494019 - Fixing the registration on python 2.6 to not include dbus.String
objects in hardware profile as new xmlrpclib _dump method validates based on
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 624e94b..11eb33d 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.6.2-1 client/rhel/rhn-client-tools/
+0.7.1-1 client/rhel/rhn-client-tools/
commit c72d16c5bac1ff333598616bf1fdd8e994c28ac5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 1 14:03:21 2009 +0200
move "Requires: yum-rhn-plugin" from rhn-client-tools to rhn-check
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index a1d3f20..aed48cd 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: rhnlib >= 2.2.7
-Requires: yum-rhn-plugin >= 0.5.3-30
Requires: rhpl >= 0.81-2
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python
@@ -35,6 +34,7 @@ system to receive software updates from Red Hat Network or Spacewalk.
Summary: Check for RHN actions
Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
+Requires: yum-rhn-plugin >= 0.5.3-30
%description -n rhn-check
rhn-check polls a Red Hat Network or Spacewalk server to find and execute
commit 952281b547c5fc7fdda6487fc392d253f7cc18b9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 1 13:51:49 2009 +0200
add scriplet to refres icon cache
Done according to:
https://fedoraproject.org/wiki/Packaging/ScriptletSnippets#Icon_Cache
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index adcd1eb..a1d3f20 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -82,6 +82,17 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rh
%find_lang %{name}
+%post -n rhn-setup-gnome
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun -n rhn-setup-gnome
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans -n rhn-setup-gnome
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%clean
commit a66f82704caaacc396f78854ce1b38cb6422dfed
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 1 14:11:59 2009 +0200
change appeareance of icon and put it to Administration rather then to Preferences
diff --git a/client/rhel/rhn-client-tools/rhn_register.desktop b/client/rhel/rhn-client-tools/rhn_register.desktop
index d8f5240..f6a06d9 100644
--- a/client/rhel/rhn-client-tools/rhn_register.desktop
+++ b/client/rhel/rhn-client-tools/rhn_register.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
Encoding=UTF-8
-Name=rhn_register
-GenericName=Registering for software updated
+Name=RHN Registration
+GenericName=Register for software updates from Spacewalk/Satellite/Red Hat Network
Comment=Register to Spacewalk/Satellite/Red Hat Network.
Exec=rhn_register
Icon=up2date
Terminal=false
Type=Application
-Categories=Settings;
+Categories=System;Settings;X-Red-Hat-Base;
14 years, 8 months
Changes to 'refs/tags/spacewalk-java-0.7.3-1'
by Michael Mraka
Tag 'spacewalk-java-0.7.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-01 11:49 +0000
Tagging package [spacewalk-java] version [0.7.3-1] in directory [java/].
Changes since spacewalk-0.7.1-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [0.7.3-1].
---
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---
14 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 8bb83a47d23e6cfcfa7ea8e2b3d54a7596be9738
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 13:49:44 2009 +0200
Automatic commit of package [spacewalk-java] release [0.7.3-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 21416ac..2be90f5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.3-1
+- moved database specific files to subpackages
+- 518227 - missing repo label would result in invalid summary error
+- 498009 - kickstart label would not show up on kickstart variables page
+- setting the default checksum type for channels to be sha1 instead of sha256
+- making RepoSyncTask use the --quiet flag for repo syncing
+- new way of waiting on process for RepoSync task. Hopefully this does not
+ bail out after a long time
+
* Thu Aug 20 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7.2-1
- fix duplicate base channels listed in the "Parent Channel" dropdown (jesusr(a)redhat.com)
- Log files should be ghosted rather than belonging to a package (m.d.chappell(a)bath.ac.uk)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1798e21..017711f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.2-1 java/
+0.7.3-1 java/
14 years, 8 months
Changes to 'refs/tags/spacewalk-0.7.1-1'
by Michael Mraka
Tag 'spacewalk-0.7.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-01 11:48 +0000
Tagging package [spacewalk] version [0.7.1-1] in directory [spacewalk/package/].
Changes since spacewalk-setup-0.7.2-1:
Michael Mraka (8):
split spacewalk metapackage into spacewalk-oracle/postgresql so we can
postgresql dependency moved to spacewalk-postgresql
added missing %%files sections
moved database specific files to subpackages
added java/database specific subpackages
Removed %%files - we don't want to build spacewalk package.
Let's change codename to something new and novel.
Automatic commit of package [spacewalk] release [0.7.1-1].
Milan Zazrivec (3):
substitute macros before comparing results
Show what's actually being called during transformation
localize $/
Miroslav Suchý (1):
remove dead code
---
backend/spacewalk-backend.spec | 1
java/spacewalk-java.spec | 29 +++++++++-
monitoring/PerlModules/NP/OracleDB/NPRecords.pm | 60 ---------------------
rel-eng/packages/spacewalk | 2
spacewalk/package/spacewalk.spec | 68 ++++++++++++++++++++++--
spacewalk/setup/bin/spacewalk-setup-jabberd | 12 ++--
6 files changed, 96 insertions(+), 76 deletions(-)
---
14 years, 8 months
rel-eng/packages spacewalk/package
by Michael Mraka
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 43f9a75d0ecd854ab08195901ff1ae7ff8eb2161
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 13:48:21 2009 +0200
Automatic commit of package [spacewalk] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk
index bd20300..78cf010 100644
--- a/rel-eng/packages/spacewalk
+++ b/rel-eng/packages/spacewalk
@@ -1 +1 @@
-0.6.4-1 spacewalk/package/
+0.7.1-1 spacewalk/package/
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index ac256cb..c55ffd7 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,7 +1,7 @@
%define release_name Gemini
Name: spacewalk
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
Summary: Spacewalk Systems Management Application
URL: https://fedorahosted.org/spacewalk
@@ -151,6 +151,11 @@ rm -rf %{buildroot}
%files postgresql
%changelog
+* Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.1-1
+- let's change codename to something new
+- split spacewalk metapackage into spacewalk-oracle/postgresql
+- bumping Version to 0.7.0
+
* Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.4-1
- Re-enable spacewalk-monitoring-selinux dependency for F11.
(dgoodwin(a)redhat.com)
14 years, 8 months
7 commits - backend/spacewalk-backend.spec java/spacewalk-java.spec spacewalk/package
by Michael Mraka
backend/spacewalk-backend.spec | 1
java/spacewalk-java.spec | 29 ++++++++++++++++--
spacewalk/package/spacewalk.spec | 61 ++++++++++++++++++++++++++++++++++++---
3 files changed, 83 insertions(+), 8 deletions(-)
New commits:
commit 89e7033ca769fb1b00e95b5b4592b4283880c1b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 13:29:47 2009 +0200
Let's change codename to something new and novel.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index ead46e3..ac256cb 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,4 +1,4 @@
-%define release_name Alpha
+%define release_name Gemini
Name: spacewalk
Version: 0.7.0
commit a28068fe0a9336896ae2c42310726463f0b1219a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 13:21:38 2009 +0200
Removed %%files - we don't want to build spacewalk package.
From now the main package is spacewalk-oracle or spacewalk-postgresql
depending on choosen db backend.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index f11a567..ead46e3 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,4 +1,5 @@
%define release_name Alpha
+
Name: spacewalk
Version: 0.7.0
Release: 1%{?dist}
@@ -141,11 +142,9 @@ echo "Spacewalk release %{version} (%{release_name})" > $RPM_BUILD_ROOT/%{_sysco
%clean
rm -rf %{buildroot}
-%files
-%defattr(-,root,root)
-/%{_sysconfdir}/spacewalk-release
-
%files common
+%defattr(-,root,root)
+%{_sysconfdir}/spacewalk-release
%files oracle
commit 58b5384fa5c9dac069d81e45417d62b830779ce8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 16:02:51 2009 +0200
added java/database specific subpackages
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 686a193..f11a567 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -101,6 +101,7 @@ Conflicts: spacewalk-postgresql
Requires: oracle-instantclient-basic >= 10.2.0
Requires: oracle-instantclient-sqlplus >= 10.2.0
+Requires: spacewalk-java-oracle
Requires: perl(DBD::Oracle)
Requires: cx_Oracle
@@ -117,6 +118,7 @@ Obsoletes: spacewalk < 0.7.0
Requires: spacewalk-common = %{version}-%{release}
Conflicts: spacewalk-oracle
+Requires: spacewalk-java-postgresql
Requires: perl(DBD::Pg)
Requires: python-pgsql
commit 9ad27b58661e780f3c824b144bdf36ab8b012417
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 15:59:02 2009 +0200
moved database specific files to subpackages
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2f06fc4..21416ac 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -41,7 +41,6 @@ Requires: jta
Requires: log4j
Requires: redstone-xmlrpc
Requires: oscache
-Requires: ojdbc14
Requires: servletapi5
Requires: struts >= 0:1.2.9
Requires: tomcat5
@@ -51,9 +50,9 @@ Requires: sitemesh
Requires: stringtree-json
Requires: spacewalk-java-config
Requires: spacewalk-java-lib
+Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
Requires: jpackage-utils >= 0:1.5
-Requires: postgresql-jdbc
Requires: cobbler >= 1.6.3
BuildRequires: ant
BuildRequires: ant-apache-regexp
@@ -131,6 +130,24 @@ Provides: rhn-java-lib-sat = %{version}-%{release}
This package contains the jar files for the Spacewalk Java web application
and taskomatic process.
+%package oracle
+Summary: Oracle database backend support files for Spacewalk Java
+Group: Applications/Internet
+Requires: ojdbc14
+Provides: spacewalk-java-jdbc = %{version}-%{release}
+
+%description oracle
+This package contains Oracle database backend files for the Spacewalk Java.
+
+%package postgresql
+Summary: PostgreSQL database backend support files for Spacewalk Java
+Group: Applications/Internet
+Requires: postgresql-jdbc
+Provides: spacewalk-java-jdbc = %{version}-%{release}
+
+%description postgresql
+This package contains PostgreSQL database backend files for the Spacewalk Java.
+
%package -n spacewalk-taskomatic
Summary: Java version of taskomatic
Group: Applications/Internet
@@ -150,12 +167,12 @@ Requires: jfreechart >= 0:1.0.9
Requires: jpam
Requires: log4j
Requires: oscache
-Requires: ojdbc14
Requires: xalan-j2 >= 0:2.6.0
Requires: xerces-j2
Requires: tanukiwrapper
Requires: spacewalk-java-config
Requires: spacewalk-java-lib
+Requires: spacewalk-java-jdbc
Requires: concurrent
Requires: quartz
Requires: cobbler >= 1.6.3
@@ -256,6 +273,12 @@ fi
%attr(644, root, root) %{_datadir}/rhn/classes/log4j.properties
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
+%files oracle
+%{jardir}/ojdbc14.jar
+
+%files postgresql
+%{jardir}/postgresql-jdbc.jar
+
%changelog
* Thu Aug 20 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7.2-1
- fix duplicate base channels listed in the "Parent Channel" dropdown (jesusr(a)redhat.com)
commit c918fc0ec25f04350bc617ece9f770b589da9afd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 14:23:01 2009 +0200
added missing %%files sections
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 2451d11..686a193 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -143,6 +143,12 @@ rm -rf %{buildroot}
%defattr(-,root,root)
/%{_sysconfdir}/spacewalk-release
+%files common
+
+%files oracle
+
+%files postgresql
+
%changelog
* Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.4-1
- Re-enable spacewalk-monitoring-selinux dependency for F11.
commit d44829e4303407cca1888f499702c8643a415eb9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 14:05:31 2009 +0200
postgresql dependency moved to spacewalk-postgresql
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fea3df8..20d0ac9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -17,7 +17,6 @@ Requires: python, rpm-python
# /etc/rhn is provided by spacewalk-proxy-common or by spacewalk-config
Requires: /etc/rhn
Requires: rhnlib >= 1.8
-Requires: python-pgsql
BuildRequires: /usr/bin/msgfmt
BuildRequires: /usr/bin/docbook2man
BuildRequires: docbook-utils
commit 5f57f4ffa3e4255e7e6ffb109a290d13499ede65
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 14:02:16 2009 +0200
split spacewalk metapackage into spacewalk-oracle/postgresql so we can
install only one database backend
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 3b361b4..2451d11 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -8,6 +8,18 @@ Group: Applications/Internet
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
+
+%description
+Spacewalk is a systems management application that will
+inventory, provision, update and control your Linux and
+Solaris machines.
+
+%package common
+Summary: Spacewalk Systems Management Application with Oracle database backend
+Group: Applications/Internet
+License: GPLv2
+Obsoletes: spacewalk < 0.7.0
+
BuildRequires: python
Requires: python >= 2.3
Requires: spacewalk-setup
@@ -74,7 +86,41 @@ Requires: spacewalk-selinux
%endif
-%description
+%description common
+Spacewalk is a systems management application that will
+inventory, provision, update and control your Linux and
+Solaris machines.
+
+%package oracle
+Summary: Spacewalk Systems Management Application with Oracle database backend
+Group: Applications/Internet
+License: GPLv2
+Obsoletes: spacewalk < 0.7.0
+Requires: spacewalk-common = %{version}-%{release}
+Conflicts: spacewalk-postgresql
+
+Requires: oracle-instantclient-basic >= 10.2.0
+Requires: oracle-instantclient-sqlplus >= 10.2.0
+Requires: perl(DBD::Oracle)
+Requires: cx_Oracle
+
+%description oracle
+Spacewalk is a systems management application that will
+inventory, provision, update and control your Linux and
+Solaris machines.
+
+%package postgresql
+Summary: Spacewalk Systems Management Application with PostgreSQL database backend
+Group: Applications/Internet
+License: GPLv2
+Obsoletes: spacewalk < 0.7.0
+Requires: spacewalk-common = %{version}-%{release}
+Conflicts: spacewalk-oracle
+
+Requires: perl(DBD::Pg)
+Requires: python-pgsql
+
+%description postgresql
Spacewalk is a systems management application that will
inventory, provision, update and control your Linux and
Solaris machines.
14 years, 8 months
monitoring/PerlModules
by Miroslav Suchý
monitoring/PerlModules/NP/OracleDB/NPRecords.pm | 60 ------------------------
1 file changed, 60 deletions(-)
New commits:
commit c7e571c91e477c0cbf075ddf8a5ba18a78758d36
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 31 14:56:46 2009 +0200
remove dead code
diff --git a/monitoring/PerlModules/NP/OracleDB/NPRecords.pm b/monitoring/PerlModules/NP/OracleDB/NPRecords.pm
index 7ae74d8..7fa22bd 100644
--- a/monitoring/PerlModules/NP/OracleDB/NPRecords.pm
+++ b/monitoring/PerlModules/NP/OracleDB/NPRecords.pm
@@ -491,66 +491,6 @@ use vars qw(@ISA);
@ISA=qw(CFDBRecord);
############################################
-package ProbeTimeSeriesIds;
-use strict;
-use vars qw(@ISA);
-@ISA=qw(CFDBRecord);
-
-sub RemoveAllForSatellite
-{
- my ($class,$satNodeId) = @_;
- $class = ref($class) || $class;
- # Delete existing time series IDs for the satellite.
- my $sqlStmt = "delete from probe_time_series_ids
- where probe_id in (
- select distinct host_probe.recid
- from host_probe, sat_node
- where host_probe.sat_cluster_id = sat_node.sat_cluster_id
- and sat_node.recid = ?
- union
- select distinct check_probe.recid
- from check_probe
- where check_probe.sat_cluster_id = sat_node.sat_cluster_id
- and sat_node.recid = ?)";
-
- my $sth = $class->DatabaseConnection->prepare($sqlStmt);
- # print "RemoveAllForSatellite: sat node $satNodeId\n".$sqlStmt."\n";
- my $ret = $sth->execute($satNodeId, $satNodeId);
- if (!defined($ret)) {
- my $msg = "Cannot delete probe time series OID for satellite node $satNodeId: ";
- if ($sth) {
- $msg .= $sth->errstr."\n";
- }
- print $msg."\n"; # Goes into satellite output
- warn $msg.$sqlStmt; # Goes into apache log
- }
-}
-
-sub InsertRecords
-{
- my $class = shift;
- my @plugins = @_;
- $class = ref($class) || $class;
-
- my $sth = $class->DatabaseConnection->prepare
- ("insert into probe_time_series_ids(
- PROBE_ID, METRIC_ID, TEMPLATE_ID, CUST_GROUP_ID, TEMPLATE_INSTANCE_STRING) values
- (?, ?, ?, 0, ?)");
- foreach my $plugin (@plugins) {
- my ($probeId, $templateId, $metricId, $templateInstance) = @$plugin;
- #print "Inserting probeId: $probeId, templateId: $templateId, metricId: $metricId, templateInstance $templateInstance\n";
- my $ret = $sth->execute($probeId, $metricId, $templateId, $templateInstance);
-
- if (!defined($ret)) {
- my $msg = "Cannot insert probe time series OID for ".join(':', @$plugin).": ".$sth->errstr;
- print $msg."\n"; # Goes into satellite output
- warn $msg; # Goes into apache log
- }
- }
-}
-
-
-############################################
package SNMPAlertRecord;
use strict;
use vars qw(@ISA);
14 years, 8 months