4 commits - rel-eng/comps rel-eng/packages spec-tree/simple-xml
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1
rel-eng/packages/simple-xml | 1
spec-tree/simple-xml/simple-xml.spec | 100 ++++++++++++++++++++++
6 files changed, 105 insertions(+)
New commits:
commit 2a07b18d2cf27338771d77196a58c1283182929d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 15:18:46 2012 +0200
Automatic commit of package [simple-xml] release [2.6.7-1].
diff --git a/rel-eng/packages/simple-xml b/rel-eng/packages/simple-xml
new file mode 100644
index 0000000..287ad8f
--- /dev/null
+++ b/rel-eng/packages/simple-xml
@@ -0,0 +1 @@
+2.6.7-1 spec-tree/simple-xml/
diff --git a/spec-tree/simple-xml/simple-xml.spec b/spec-tree/simple-xml/simple-xml.spec
index 096ff82..fb57958 100644
--- a/spec-tree/simple-xml/simple-xml.spec
+++ b/spec-tree/simple-xml/simple-xml.spec
@@ -93,5 +93,8 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Oct 08 2012 Jan Pazdziora 2.6.7-1
+- Updating simple-xml to latest version (2.6.7).
+
* Thu May 17 2012 Miroslav Suchy <msuchy(a)redhat.com> 2.6.3-1
- initial release for Fedora
commit 955372a9c59fd9fc23c2c0001c19d950b3342819
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 15:18:23 2012 +0200
Updating simple-xml to latest version (2.6.7).
diff --git a/spec-tree/simple-xml/simple-xml.spec b/spec-tree/simple-xml/simple-xml.spec
index 6c5aa56..096ff82 100644
--- a/spec-tree/simple-xml/simple-xml.spec
+++ b/spec-tree/simple-xml/simple-xml.spec
@@ -19,7 +19,7 @@
Name: simple-xml
Summary: An XML serialization framework for Java
-Version: 2.6.3
+Version: 2.6.7
Release: 1%{?dist}
%if 0%{?suse_version}
License: Apache-2.0
commit 7aa76deb00fe2ff83c7a2e3ab9bc6f41ca89ccee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 15:17:25 2012 +0200
Adding simple-xml .spec.
diff --git a/spec-tree/simple-xml/simple-xml.spec b/spec-tree/simple-xml/simple-xml.spec
new file mode 100644
index 0000000..6c5aa56
--- /dev/null
+++ b/spec-tree/simple-xml/simple-xml.spec
@@ -0,0 +1,97 @@
+#
+# spec file for package simple-xml
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuremberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+%define third_party_jars bea-stax-api xpp3
+
+Name: simple-xml
+Summary: An XML serialization framework for Java
+Version: 2.6.3
+Release: 1%{?dist}
+%if 0%{?suse_version}
+License: Apache-2.0
+Group: Development/Libraries/Java
+%else
+License: ASL 2.0
+Group: Development/Libraries
+%endif
+Url: http://simple.sourceforge.net
+Source0: http://downloads.sourceforge.net/simple/%{name}-%{version}.zip
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: ant
+%if 0%{?suse_version}
+BuildRequires: bea-stax
+%else
+BuildRequires: bea-stax-api
+%endif
+BuildRequires: java-devel
+BuildRequires: jpackage-utils >= 1.6
+BuildRequires: xpp3
+BuildArch: noarch
+Provides: java(org.simpleframework:simple-xml) == 2.6.3
+
+%description
+Simple is a high performance XML serialization and configuration framework for
+Java. Its goal is to provide an XML framework that enables rapid development
+of XML configuration and communication systems.
+
+%package javadoc
+%if 0%{?suse_version}
+License: Apache-2.0
+Group: Development/Languages/Java
+%else
+License: ASL 2.0
+Group: Documentation
+%endif
+Summary: Javadocs for Simple XML Serialization Framework
+
+%description javadoc
+Simple is a high performance XML serialization and configuration framework for
+Java. Its goal is to provide an XML framework that enables rapid development
+of XML configuration and communication systems.
+
+%prep
+%setup -q
+rm lib/*.jar
+build-jar-repository -p lib/ %third_party_jars
+
+%build
+ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+
+%install
+#jars
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
+install -m 644 jar/simple-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+#javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(0644,root,root,0755)
+%{_javadir}/*.jar
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Thu May 17 2012 Miroslav Suchy <msuchy(a)redhat.com> 2.6.3-1
+- initial release for Fedora
commit df71326bb69a1ac958c486f8792a9df6f6e4205d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 15:17:00 2012 +0200
The simple-xml-javadoc falls into the documentation group.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index 09f2313..36bc2a1 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -152,6 +152,7 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="optional">jpam-javadoc</packagereq>
+ <packagereq type="optional">simple-xml-javadoc</packagereq>
</packagelist>
</group>
<group>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index f62f17b..cd35a46 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -138,6 +138,7 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="optional">jpam-javadoc</packagereq>
+ <packagereq type="optional">simple-xml-javadoc</packagereq>
</packagelist>
</group>
<group>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index ffec915..a4e3cd3 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -219,6 +219,7 @@
<packagereq type="optional">msv-xsdlib-javadoc</packagereq>
<packagereq type="optional">oscache-javadoc</packagereq>
<packagereq type="optional">relaxngDatatype-javadoc</packagereq>
+ <packagereq type="optional">simple-xml-javadoc</packagereq>
<packagereq type="optional">sitemesh-javadoc</packagereq>
<packagereq type="optional">tanukiwrapper-javadoc</packagereq>
<packagereq type="optional">ws-jaxme-javadoc</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 74fa71e..31ef2ec 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -153,6 +153,7 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="optional">jpam-javadoc</packagereq>
+ <packagereq type="optional">simple-xml-javadoc</packagereq>
<packagereq type="optional">tanukiwrapper-javadoc</packagereq>
</packagelist>
</group>
11 years, 8 months
rel-eng/comps spacewalk/package
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 -
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 -
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 -
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 -
spacewalk/package/spacewalk.spec | 1 -
5 files changed, 5 deletions(-)
New commits:
commit 621be9c96d4fbde3df0becd032ccc206b1703daf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 14:45:25 2012 +0200
The spacewalk-backend-xp subpackage is not longer built.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index b47e574..09f2313 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -88,7 +88,6 @@
<packagereq type="default">spacewalk-backend-tools</packagereq>
<packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
<packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
- <packagereq type="default">spacewalk-backend-xp</packagereq>
<packagereq type="default">spacewalk-base</packagereq>
<packagereq type="default">spacewalk-base-minimal</packagereq>
<packagereq type="default">spacewalk-branding</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index 8609c6f..f62f17b 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -76,7 +76,6 @@
<packagereq type="default">spacewalk-backend-tools</packagereq>
<packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
<packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
- <packagereq type="default">spacewalk-backend-xp</packagereq>
<packagereq type="default">spacewalk-base</packagereq>
<packagereq type="default">spacewalk-base-minimal</packagereq>
<packagereq type="default">spacewalk-branding</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 436c679..ffec915 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -130,7 +130,6 @@
<packagereq type="default">spacewalk-backend-tools</packagereq>
<packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
<packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
- <packagereq type="default">spacewalk-backend-xp</packagereq>
<packagereq type="default">spacewalk-base</packagereq>
<packagereq type="default">spacewalk-base-minimal</packagereq>
<packagereq type="default">spacewalk-branding</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 747d794..74fa71e 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -89,7 +89,6 @@
<packagereq type="default">spacewalk-backend-tools</packagereq>
<packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
<packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
- <packagereq type="default">spacewalk-backend-xp</packagereq>
<packagereq type="default">spacewalk-base</packagereq>
<packagereq type="default">spacewalk-base-minimal</packagereq>
<packagereq type="default">spacewalk-branding</packagereq>
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index f701ed2..54d06b1 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -53,7 +53,6 @@ Requires: spacewalk-backend-server
Requires: spacewalk-backend-sql
Requires: spacewalk-backend-xml-export-libs
Requires: spacewalk-backend-xmlrpc
-Requires: spacewalk-backend-xp
Requires: rhnpush
11 years, 8 months
rel-eng/comps
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 -
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 -
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 -
3 files changed, 3 deletions(-)
New commits:
commit 6c01e4f8be0b2e82d20ea5f662ca7bd2048686ed
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 14:40:27 2012 +0200
The latest perl-DBD-Oracle does not build the -explain subpackage.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index 52362f7..b47e574 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -161,7 +161,6 @@
<description>Spacewalk Server Non-installatble Packages</description>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
<packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 07b7045..436c679 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -234,7 +234,6 @@
<description>Spacewalk Server Non-installatble Packages</description>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
<packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 8d9de1e..747d794 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -163,7 +163,6 @@
<description>Spacewalk Server Non-installatble Packages</description>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
<packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
11 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 2 -
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 16 ++++++++--
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 2 -
java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java | 9 +++--
4 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit 1c7490e39d859179573e2c735e82bc3acb8e3f05
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Oct 5 16:14:14 2012 +0200
863479 - enhancing kickstart file sync with cobbler
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 1f6a80d..c9f007e 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -1312,7 +1312,7 @@ public class KickstartData {
}
}
- return buildCobblerFileName();
+ return null;
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
index 6366266..9ebd6aa 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
@@ -38,6 +38,16 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand {
}
/**
+ * Call this if you want to use the taskomatic_user.
+ *
+ * Useful for automated non-user initiated syncs
+ * @param ksDataIn to sync
+ */
+ public CobblerProfileEditCommand(KickstartData ksDataIn) {
+ super(ksDataIn);
+ }
+
+ /**
* {@inheritDoc}
*/
public ValidatorError store() {
@@ -45,12 +55,12 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand {
return new CobblerProfileCreateCommand(ksData, user).store();
}
- Profile prof = Profile.lookupById(CobblerXMLRPCHelper.getConnection(user),
- ksData.getCobblerId());
+ Profile prof = Profile.lookupById(getCobblerConnection(), ksData.getCobblerId());
if (prof != null) {
String cobName = makeCobblerName(ksData);
- if (!cobName.equals(prof.getName())) {
+ if (!cobName.equals(prof.getName()) ||
+ !ksData.buildCobblerFileName().equals(ksData.getCobblerFileName())) {
// delete current cfg file
KickstartFactory.removeKickstartTemplatePath(ksData);
// create new cfg file
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
index b66610f..cf9ed57 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
@@ -149,7 +149,7 @@ public class CobblerProfileSyncCommand extends CobblerCommand {
//Now re-set the filename in case someone set it incorrectly
String handle = (String) invokeXMLRPC("get_profile_handle",
cobblerProfile.get("name"), xmlRpcToken);
- invokeXMLRPC("modify_profile", handle, "kickstart", profile.getCobblerFileName(),
+ invokeXMLRPC("modify_profile", handle, "kickstart", profile.buildCobblerFileName(),
xmlRpcToken);
invokeXMLRPC("save_profile", handle, xmlRpcToken);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
index 02a2e47..31b391b 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
+import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileEditCommand;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
import org.cobbler.CobblerConnection;
@@ -52,10 +53,12 @@ public class KickstartFileSyncTask extends RhnJavaJob {
if (!ks.isRawData()) {
Profile p = Profile.lookupById(cc, ks.getCobblerId());
if (p != null) {
- String file = p.getKickstart();
- if (file != null && !(new File(file)).exists()) {
+ String ksFilePath = ks.buildCobblerFileName();
+ if (!(new File(ksFilePath)).exists() ||
+ !ksFilePath.equals(p.getKickstart())) {
log.info("Syncing " + ks.getLabel());
- KickstartFactory.saveKickstartData(ks);
+ CobblerProfileEditCommand cpec = new CobblerProfileEditCommand(ks);
+ cpec.store();
}
}
}
11 years, 8 months
Changes to 'refs/tags/perl-DBD-Oracle-1.50-1'
by Jan Pazdziora
Tag 'perl-DBD-Oracle-1.50-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-08 11:49 +0000
Tagging package [perl-DBD-Oracle] version [1.50-1] in directory [spec-tree/perl-DBD-Oracle/].
Changes since cx_Oracle-5.1.2-1:
Jan Pazdziora (3):
Allow cx_Oracle builds for Fedora 17 as well.
Rebase perl-DBD-Oracle to 1.50.
Automatic commit of package [perl-DBD-Oracle] minor release [1.50-1].
---
rel-eng/packages/perl-DBD-Oracle | 2 +-
rel-eng/tito.props | 2 +-
spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec | 24 ++++++++----------------
spec-tree/perl-DBD-Oracle/update-blob-syn.patch | 18 ------------------
4 files changed, 10 insertions(+), 36 deletions(-)
---
11 years, 8 months
2 commits - rel-eng/packages rel-eng/tito.props spec-tree/perl-DBD-Oracle
by Jan Pazdziora
rel-eng/packages/perl-DBD-Oracle | 2 +-
rel-eng/tito.props | 2 +-
spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec | 24 ++++++++----------------
spec-tree/perl-DBD-Oracle/update-blob-syn.patch | 18 ------------------
4 files changed, 10 insertions(+), 36 deletions(-)
New commits:
commit 820590f50c2c69b9699479fe3918ff267c161e6c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 13:49:17 2012 +0200
Automatic commit of package [perl-DBD-Oracle] minor release [1.50-1].
diff --git a/rel-eng/packages/perl-DBD-Oracle b/rel-eng/packages/perl-DBD-Oracle
index 1cff602..6fe1fcb 100644
--- a/rel-eng/packages/perl-DBD-Oracle
+++ b/rel-eng/packages/perl-DBD-Oracle
@@ -1 +1 @@
-1.27-2 spec-tree/perl-DBD-Oracle/
+1.50-1 spec-tree/perl-DBD-Oracle/
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index 26bb405..5651855 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -62,6 +62,10 @@ rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
%{_mandir}/man3/*
%changelog
+* Mon Oct 08 2012 Jan Pazdziora 1.50-1
+- Rebase perl-DBD-Oracle to 1.50.
+- %%defattr is not needed since rpm 4.4
+
* Fri Jan 07 2011 Jan Pazdziora 1.27-2
- We shall hardcode the 11g version.
- Revert "Specify the InstantClient version with -V."
commit 336a345f09e390bb0c14986ebc8783863803569e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 13:47:36 2012 +0200
Rebase perl-DBD-Oracle to 1.50.
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index d27ffef..b955669 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -22,4 +22,4 @@ blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient sm
[spacewalk-nightly-fedora17]
disttag = .fc17
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux perl-DBD-Oracle
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index 59293a5..26bb405 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -1,12 +1,11 @@
Summary: DBD-Oracle module for perl
Name: perl-DBD-Oracle
-Version: 1.27
-Release: 2%{?dist}
+Version: 1.50
+Release: 1%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Source0: DBD-Oracle-%{version}.tar.gz
Source1: demo.mk
-Patch2: update-blob-syn.patch
Url: http://www.cpan.org
BuildRoot: %{_tmppath}/perl-DBD-Oracle-buildroot/
BuildRequires: perl >= 0:5.6.1, perl(DBI)
@@ -19,20 +18,12 @@ Requires: perl(DBI) >= 1.51
%description
DBD-Oracle module for perl
-%package explain
-Summary: ora_explain script from DBD-Oracle module for perl
-Group: Development/Libraries
-
-%description explain
-ora_explain script
-
%prep
%define modname %(echo %{name}| sed 's/perl-//')
%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%setup -q -n %{modname}-%{version}
-%patch2 -p1
cp %{SOURCE1} .
@@ -50,7 +41,7 @@ ORACLE_HOME=$(find /usr/lib/oracle/ -name client64 | tail -1)
ORACLE_HOME=$(find /usr/lib/oracle/ -name client | tail -1)
%endif
export ORACLE_HOME
-perl Makefile.PL -m $MKFILE INSTALLDIRS="vendor" PREFIX=%{_prefix} -V 11.2.0.2.0
+perl Makefile.PL -m $MKFILE INSTALLDIRS="vendor" PREFIX=%{_prefix} -V 11.2.0.3.0
make %{?_smp_mflags} OPTIMIZE="%{optflags}"
%clean
@@ -63,16 +54,13 @@ make PREFIX=$RPM_BUILD_ROOT%{_prefix} pure_install
rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
%files
+%defattr(-,root,root)
%{perl_vendorarch}/auto/DBD/
%{perl_vendorarch}/DBD/
%{perl_vendorarch}/Oraperl.pm
%{perl_vendorarch}/oraperl.ph
%{_mandir}/man3/*
-%files explain
-%{_bindir}/ora_explain
-%{_mandir}/man1/ora_explain.1.gz
-
%changelog
* Fri Jan 07 2011 Jan Pazdziora 1.27-2
- We shall hardcode the 11g version.
diff --git a/spec-tree/perl-DBD-Oracle/update-blob-syn.patch b/spec-tree/perl-DBD-Oracle/update-blob-syn.patch
deleted file mode 100644
index 423fd6b..0000000
--- a/spec-tree/perl-DBD-Oracle/update-blob-syn.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- DBD-Oracle-1.23-orig/oci8.c 2010-01-28 16:27:54.000000000 +0100
-+++ DBD-Oracle-1.23/oci8.c 2010-05-19 13:13:35.000000000 +0200
-@@ -4030,6 +4030,7 @@
- ub2 numcols = 0;
- imp_fbh_t *fbh;
- int unmatched_params;
-+ char new_tablename[100];
- I32 i,j;
- char *p;
- lob_refetch_t *lr = NULL;
-@@ -4067,7 +4068,6 @@
- if (status == OCI_SUCCESS) { /* There is a synonym, get the schema */
- char *syn_schema=NULL;
- char syn_name[100];
-- char new_tablename[100];
- ub4 tn_len = 0, syn_schema_len = 0;
-
- strncpy(syn_name,tablename,strlen(tablename));
11 years, 8 months
Changes to 'refs/tags/cx_Oracle-5.1.2-1'
by Jan Pazdziora
Tag 'cx_Oracle-5.1.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-08 10:06 +0000
Tagging package [cx_Oracle] version [5.1.2-1] in directory [spec-tree/cx_Oracle/].
Changes since cx_Oracle-5.0.4-2:
Jan Pazdziora (2):
Rebase to cx_Oracle 5.1.2.
Automatic commit of package [cx_Oracle] release [5.1.2-1].
Milan Zazrivec (1):
863997 - set correct exit code for check-update in case of error
---
client/rhel/yum-rhn-plugin/rhnplugin.py | 4 ++++
rel-eng/packages/cx_Oracle | 2 +-
spec-tree/cx_Oracle/cx_Oracle.spec | 7 +++++--
3 files changed, 10 insertions(+), 3 deletions(-)
---
11 years, 8 months
3 commits - rel-eng/packages rel-eng/tito.props spec-tree/cx_Oracle
by Jan Pazdziora
rel-eng/packages/cx_Oracle | 2 +-
rel-eng/tito.props | 2 +-
spec-tree/cx_Oracle/cx_Oracle.spec | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 5743f30f35afa33cba13928c144e9d20341df374
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 12:05:23 2012 +0200
Allow cx_Oracle builds for Fedora 17 as well.
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index e372166..d27ffef 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -22,4 +22,4 @@ blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient sm
[spacewalk-nightly-fedora17]
disttag = .fc17
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux cx_Oracle perl-DBD-Oracle
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux perl-DBD-Oracle
commit 3cb94de4654bc7785e86a00bb268ba6aa1bab728
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 12:06:40 2012 +0200
Automatic commit of package [cx_Oracle] release [5.1.2-1].
diff --git a/rel-eng/packages/cx_Oracle b/rel-eng/packages/cx_Oracle
index 0f88d5d..a3d71bd 100644
--- a/rel-eng/packages/cx_Oracle
+++ b/rel-eng/packages/cx_Oracle
@@ -1 +1 @@
-5.0.4-2 spec-tree/cx_Oracle/
+5.1.2-1 spec-tree/cx_Oracle/
diff --git a/spec-tree/cx_Oracle/cx_Oracle.spec b/spec-tree/cx_Oracle/cx_Oracle.spec
index f88cf3c..d543992 100644
--- a/spec-tree/cx_Oracle/cx_Oracle.spec
+++ b/spec-tree/cx_Oracle/cx_Oracle.spec
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE.txt README.txt BUILD.txt HISTORY.txt html samples test
%changelog
+* Mon Oct 08 2012 Jan Pazdziora 5.1.2-1
+- Rebase to cx_Oracle 5.1.2.
+
* Mon Oct 08 2012 Jan Pazdziora 5.0.4-2
- Require latest greatest oracle-instantclient11.2-*.
- %%defattr is not needed since rpm 4.4
commit c93edb3be1145d6e675bea93c89a9896fd87d878
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 8 12:04:58 2012 +0200
Rebase to cx_Oracle 5.1.2.
diff --git a/spec-tree/cx_Oracle/cx_Oracle.spec b/spec-tree/cx_Oracle/cx_Oracle.spec
index 14ff61e..f88cf3c 100644
--- a/spec-tree/cx_Oracle/cx_Oracle.spec
+++ b/spec-tree/cx_Oracle/cx_Oracle.spec
@@ -1,6 +1,6 @@
%define name cx_Oracle
-%define version 5.0.4
-%define release 2
+%define version 5.1.2
+%define release 1
# different arches have differnet oracle versions
%define oracleicname instantclient
11 years, 8 months
client/rhel
by Milan Zazrivec
client/rhel/yum-rhn-plugin/rhnplugin.py | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit bc6db8afd41432b63ecf55835d1e1c0a99591c01
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Oct 8 11:48:49 2012 +0200
863997 - set correct exit code for check-update in case of error
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 9e2a3bd..cc92b48 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -115,6 +115,8 @@ def init_hook(conduit):
try:
login_info = up2dateAuth.getLoginInfo()
except up2dateErrors.RhnServerException, e:
+ if hasattr(conduit._base, 'exit_code') and 'check-update' in sys.argv:
+ conduit._base.exit_code = 1
rewordError(e)
conduit.error(0, COMMUNICATION_ERROR + "\n" + RHN_DISABLED + "\n" +
unicode(e))
@@ -144,6 +146,8 @@ def init_hook(conduit):
rhn_enabled = False
return
except up2dateErrors.RhnServerException, e:
+ if hasattr(conduit._base, 'exit_code') and 'check-update' in sys.argv:
+ conduit._base.exit_code = 1
conduit.error(0, COMMUNICATION_ERROR + "\n" + CHANNELS_DISABLED +
"\n" + unicode(e))
return
11 years, 8 months
Changes to 'refs/tags/cx_Oracle-5.0.4-2'
by Jan Pazdziora
Tag 'cx_Oracle-5.0.4-2' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-08 07:37 +0000
Tagging package [cx_Oracle] version [5.0.4-2] in directory [spec-tree/cx_Oracle/].
Changes since oracle-lib-compat-11.2.0.7-1:
Jan Pazdziora (2):
Require latest greatest oracle-instantclient11.2-*.
Automatic commit of package [cx_Oracle] release [5.0.4-2].
---
rel-eng/packages/cx_Oracle | 2 +-
spec-tree/cx_Oracle/cx_Oracle.spec | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
11 years, 8 months