client/rhel rel-eng/packages
by Šimon Lukašík
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 84e66fbf72caf95a45aeca374c08bcfaf13d93f0
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Dec 11 14:29:35 2012 +0100
Automatic commit of package [spacewalk-oscap] release [0.0.12-1].
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index 7eaa9cd..85cb910 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -1,5 +1,5 @@
Name: spacewalk-oscap
-Version: 0.0.11
+Version: 0.0.12
Release: 1%{?dist}
Summary: OpenSCAP plug-in for rhn-check
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 11 2012 Simon Lukasik <slukasik(a)redhat.com> 0.0.12-1
+- Allow --cpe command-line argument to oscap.
+
* Thu Nov 01 2012 Jan Pazdziora 0.0.11-1
- 872248: Enable new `oscap' features in spacewalk-openscap.
diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap
index 5867a10..b95d4db 100644
--- a/rel-eng/packages/spacewalk-oscap
+++ b/rel-eng/packages/spacewalk-oscap
@@ -1 +1 @@
-0.0.11-1 client/rhel/spacewalk-oscap/
+0.0.12-1 client/rhel/spacewalk-oscap/
11 years, 4 months
client/rhel
by Šimon Lukašík
client/rhel/spacewalk-oscap/scap.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 1a3f72077e3ec5bbaa786a4b9755e8f1be53357c
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Dec 11 13:52:42 2012 +0100
Allow --cpe command-line argument to oscap.
Sadly, the --cpe-dict and --cpe-dict2 arguments has been only
in OpenSCAP 0.9.1 and has been merged together in OpenSCAP 0.9.2.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index 10106fd..6cd4f6b 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -62,8 +62,7 @@ def _process_params(args, filename):
allowed_args = {
'--profile': 1,
'--skip-valid': 0,
- '--cpe-dict': 1,
- '--cpe-dict2': 1,
+ '--cpe': 1,
'--fetch-remote-resources': 0,
'--datastream-id': 1,
'--xccdf-id': 1,
11 years, 4 months
rel-eng/comps rel-eng/tito.props
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/tito.props | 8 ++++----
5 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 38e49da7a51968a62903156f5b8c1c623a1fc589
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 13:18:59 2012 +0100
Put heirloom-pkgtools back to composes.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index 3ce3ba9..5744239 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -25,6 +25,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
<packagereq type="default">nocpulse-common</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index 3ce3ba9..5744239 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -25,6 +25,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
<packagereq type="default">nocpulse-common</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 92e199a..6ea46ba 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -39,6 +39,7 @@
<packagereq type="default">dom4j-repolib</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">hibernate3</packagereq>
<packagereq type="default">hibernate3-manual</packagereq>
<packagereq type="default">hibernate3-repolib</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 8239386..ba80d1e 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -25,6 +25,7 @@
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="optional">heirloom-pkgtools</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
<packagereq type="default">nocpulse-common</packagereq>
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index aab7e20..2bc79c1 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -10,16 +10,16 @@ autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-night
[spacewalk-nightly-rhel5]
disttag = .el5
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata spacewalk-oro-compat
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata spacewalk-oro-compat
[spacewalk-nightly-rhel6]
disttag = .el6
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools oracle-rhnsat-selinux jabberd-selinux apt-spacewalk python-hwdata spacewalk-oro-compat
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm oracle-rhnsat-selinux jabberd-selinux apt-spacewalk python-hwdata spacewalk-oro-compat
[spacewalk-nightly-fedora16]
disttag = .fc16
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux
[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
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux
11 years, 4 months
Changes to 'refs/tags/heirloom-pkgtools-1.070227-9'
by Jan Pazdziora
Tag 'heirloom-pkgtools-1.070227-9' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-11 10:47 +0000
Tagging package [heirloom-pkgtools] version [1.070227-9] in directory [spec-tree/heirloom-pkgtools/].
Changes since heirloom-pkgtools-1.070227-8:
Jan Pazdziora (2):
Walk both 32bit and 64bit paths.
Automatic commit of package [heirloom-pkgtools] minor release [1.070227-9].
---
rel-eng/packages/heirloom-pkgtools | 2 -
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 5 +++-
spec-tree/heirloom-pkgtools/use-flex.patch | 26 ++++++++++-----------
3 files changed, 18 insertions(+), 15 deletions(-)
---
11 years, 4 months
2 commits - rel-eng/packages spec-tree/heirloom-pkgtools
by Jan Pazdziora
rel-eng/packages/heirloom-pkgtools | 2 -
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 5 +++-
spec-tree/heirloom-pkgtools/use-flex.patch | 26 ++++++++++-----------
3 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit eff1d069bb7939848668d4f9de27d81221afb612
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 11:47:32 2012 +0100
Automatic commit of package [heirloom-pkgtools] minor release [1.070227-9].
diff --git a/rel-eng/packages/heirloom-pkgtools b/rel-eng/packages/heirloom-pkgtools
index 8310cfb..c280f9c 100644
--- a/rel-eng/packages/heirloom-pkgtools
+++ b/rel-eng/packages/heirloom-pkgtools
@@ -1 +1 @@
-1.070227-8 spec-tree/heirloom-pkgtools/
+1.070227-9 spec-tree/heirloom-pkgtools/
diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
index 879c46b..beb4917 100644
--- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
+++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
@@ -6,7 +6,7 @@ Summary: Heirloom Packaging Tools
Group: Development/Tools
License: CDDL
Version: 1.%{heriloom_pkgtools_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
URL: http://heirloom.sourceforge.net/pkgtools.html
Source0: %{name}-%{heriloom_pkgtools_version}.tar.bz2
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/sadm/install/admin/default
%changelog
+* Tue Dec 11 2012 Jan Pazdziora 1.070227-9
+- Walk both 32bit and 64bit paths.
+
* Tue Dec 11 2012 Jan Pazdziora 1.070227-8
- On Fedoras, use compat-flex and -lfl.
commit 47e4ef6bbec0eb87865b6101916aba370b1e8d50
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 11:47:27 2012 +0100
Walk both 32bit and 64bit paths.
diff --git a/spec-tree/heirloom-pkgtools/use-flex.patch b/spec-tree/heirloom-pkgtools/use-flex.patch
index b5b63b6..4f6ff9d 100644
--- a/spec-tree/heirloom-pkgtools/use-flex.patch
+++ b/spec-tree/heirloom-pkgtools/use-flex.patch
@@ -6,7 +6,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk heirloom-pkg
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = installf
OBJ = dofinal.o installf.o main.o removef.o ../../version/version.o
@@ -18,7 +18,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk heirloom-pkgto
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgadd
OBJ = check.o main.o presvr4.o quit.o ../../version/version.o
@@ -30,7 +30,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk heirloom-pkgto
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgadm
OBJ = addcert.o certs.o listcert.o lock.o main.o pkgadm_contents.o \
@@ -42,7 +42,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk heirloom-pkgto
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgchk
OBJ = checkmap.o ckentry.o main.o ../../version/version.o
@@ -54,7 +54,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk heirloom-pkgt
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgcond
OBJ = main.o ../../version/version.o
@@ -66,7 +66,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk heirloom-p
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkginstall
OBJ = backup.o check.o cppath.o dockspace.o getinst.o instvol.o main.o \
@@ -78,7 +78,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk heirloom-pkgtoo
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgmk
OBJ = main.o mkpkgmap.o quit.o splpkgmap.o ../../version/version.o
@@ -90,7 +90,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk heirloom-pkgt
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgname
OBJ = pkgname.o ../../version/version.o
@@ -102,7 +102,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk heirloom-pkg
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgparam
OBJ = pkgparam.o ../../version/version.o
@@ -114,7 +114,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk heirloom-pk
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgremove
OBJ = check.o delmap.o main.o predepend.o quit.o special.o wsreg_pkgrm.o ../../version/version.o
@@ -126,7 +126,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk heirloom-pkgtoo
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgrm
OBJ = check.o main.o presvr4.o quit.o ../../version/version.o
@@ -138,7 +138,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk heirloom-p
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = cmdexec
OBJ = cmdexec.o ../../version/version.o
@@ -150,7 +150,7 @@ diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk heirloom-pkg
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
++ -L$(CCSDIR)/lib -L/usr/lib/flex-2.5.4a -L/usr/lib64/flex-2.5.4a -lfl
BIN = pkgtrans
OBJ = main.o ../../version/version.o
11 years, 4 months
Changes to 'refs/tags/heirloom-pkgtools-1.070227-8'
by Jan Pazdziora
Tag 'heirloom-pkgtools-1.070227-8' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-11 10:43 +0000
Tagging package [heirloom-pkgtools] version [1.070227-8] in directory [spec-tree/heirloom-pkgtools/].
Changes since heirloom-pkgtools-1.070227-7:
Jan Pazdziora (2):
On Fedoras, use compat-flex and -lfl.
Automatic commit of package [heirloom-pkgtools] minor release [1.070227-8].
---
rel-eng/packages/heirloom-pkgtools | 2
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 12 +
spec-tree/heirloom-pkgtools/use-flex.patch | 156 +++++++++++++++++++++
3 files changed, 168 insertions(+), 2 deletions(-)
---
11 years, 4 months
rel-eng/packages spec-tree/heirloom-pkgtools
by Jan Pazdziora
rel-eng/packages/heirloom-pkgtools | 2 +-
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 24956a91429562c3dc921af3b30aa810bb3b3e10
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 11:43:31 2012 +0100
Automatic commit of package [heirloom-pkgtools] minor release [1.070227-8].
diff --git a/rel-eng/packages/heirloom-pkgtools b/rel-eng/packages/heirloom-pkgtools
index c4ac6d5..8310cfb 100644
--- a/rel-eng/packages/heirloom-pkgtools
+++ b/rel-eng/packages/heirloom-pkgtools
@@ -1 +1 @@
-1.070227-7 spec-tree/heirloom-pkgtools/
+1.070227-8 spec-tree/heirloom-pkgtools/
diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
index 65df664..879c46b 100644
--- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
+++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
@@ -6,7 +6,7 @@ Summary: Heirloom Packaging Tools
Group: Development/Tools
License: CDDL
Version: 1.%{heriloom_pkgtools_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
URL: http://heirloom.sourceforge.net/pkgtools.html
Source0: %{name}-%{heriloom_pkgtools_version}.tar.bz2
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/sadm/install/admin/default
%changelog
+* Tue Dec 11 2012 Jan Pazdziora 1.070227-8
+- On Fedoras, use compat-flex and -lfl.
+
* Tue Dec 11 2012 Jan Pazdziora 1.070227-7
- set correct tagger for heirloom-pkgtools
- set correct builder for heirloom-pkgtools
11 years, 4 months
spec-tree/heirloom-pkgtools
by Jan Pazdziora
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 7
spec-tree/heirloom-pkgtools/use-flex.patch | 156 +++++++++++++++++++++
2 files changed, 163 insertions(+)
New commits:
commit f33e57f25e0fc2efa55c34928a0a331d80133e2b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 11:43:09 2012 +0100
On Fedoras, use compat-flex and -lfl.
diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
index 998b3c4..65df664 100644
--- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
+++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
@@ -16,12 +16,16 @@ Patch3: binpath.patch
Patch4: sbinpath.patch
Patch5: cpio-D.patch
Patch6: compute_checksum-64bit.patch
+Patch7: use-flex.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc
BuildRequires: openssl-devel
BuildRequires: flex
+%if 0%{?fedora}
+BuildRequires: compat-flex = 2.5.4a
+%endif
%description
Heirloom Packaging Tools are Linux ports of the SVR4
@@ -36,6 +40,9 @@ OpenSolaris.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%if 0%{?fedora}
+%patch7 -p1
+%endif
%build
make -f makefile SHELL=/bin/bash CC=gcc BINDIR=%{_bindir} SBINDIR=%{_sbindir}
diff --git a/spec-tree/heirloom-pkgtools/use-flex.patch b/spec-tree/heirloom-pkgtools/use-flex.patch
new file mode 100644
index 0000000..b5b63b6
--- /dev/null
+++ b/spec-tree/heirloom-pkgtools/use-flex.patch
@@ -0,0 +1,156 @@
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk heirloom-pkgtools-070227/pkgcmds/installf/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk 2007-02-27 19:36:10.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/installf/Makefile.mk 2012-12-11 11:17:41.138065941 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = installf
+ OBJ = dofinal.o installf.o main.o removef.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgadd/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk 2007-02-27 19:36:12.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgadd/Makefile.mk 2012-12-11 11:17:41.138065941 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgadd
+ OBJ = check.o main.o presvr4.o quit.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgadm/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk 2007-02-27 19:36:14.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgadm/Makefile.mk 2012-12-11 11:17:41.139065930 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgadm
+ OBJ = addcert.o certs.o listcert.o lock.o main.o pkgadm_contents.o \
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgchk/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk 2007-02-27 19:36:16.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgchk/Makefile.mk 2012-12-11 11:17:41.139065930 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgchk
+ OBJ = checkmap.o ckentry.o main.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgcond/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk 2007-02-27 19:36:18.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgcond/Makefile.mk 2012-12-11 11:17:41.140065919 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgcond
+ OBJ = main.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkginstall/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk 2007-02-27 19:36:22.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkginstall/Makefile.mk 2012-12-11 11:17:41.139065930 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkginstall
+ OBJ = backup.o check.o cppath.o dockspace.o getinst.o instvol.o main.o \
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgmk/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk 2007-02-27 19:36:24.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgmk/Makefile.mk 2012-12-11 11:17:41.139065930 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgmk
+ OBJ = main.o mkpkgmap.o quit.o splpkgmap.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgname/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk 2007-02-27 19:36:26.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgname/Makefile.mk 2012-12-11 11:17:41.138065941 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgname
+ OBJ = pkgname.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgparam/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk 2007-02-27 19:36:28.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgparam/Makefile.mk 2012-12-11 11:17:41.139065930 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgparam
+ OBJ = pkgparam.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgremove/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk 2007-02-27 19:36:33.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgremove/Makefile.mk 2012-12-11 11:17:41.140065919 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgremove
+ OBJ = check.o delmap.o main.o predepend.o quit.o special.o wsreg_pkgrm.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgrm/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk 2007-02-27 19:36:35.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgrm/Makefile.mk 2012-12-11 11:17:41.140065919 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgrm
+ OBJ = check.o main.o presvr4.o quit.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgscripts/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk 2007-02-27 19:36:37.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgscripts/Makefile.mk 2012-12-11 11:17:41.139065930 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = cmdexec
+ OBJ = cmdexec.o ../../version/version.o
+diff -ru heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk heirloom-pkgtools-070227/pkgcmds/pkgtrans/Makefile.mk
+--- heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk 2007-02-27 19:36:39.000000000 +0100
++++ heirloom-pkgtools-070227/pkgcmds/pkgtrans/Makefile.mk 2012-12-11 11:17:41.140065919 +0100
+@@ -6,7 +6,7 @@
+
+ PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
+ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \
+- -L$(CCSDIR)/lib -ll
++ -L$(CCSDIR)/lib -L/usr/lib64/flex-2.5.4a -lfl
+
+ BIN = pkgtrans
+ OBJ = main.o ../../version/version.o
11 years, 4 months
Changes to 'refs/tags/heirloom-pkgtools-1.070227-7'
by Jan Pazdziora
Tag 'heirloom-pkgtools-1.070227-7' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-11 09:03 +0000
Tagging package [heirloom-pkgtools] version [1.070227-7] in directory [spec-tree/heirloom-pkgtools/].
Changes since rhnmd-5.3.14-1:
Jan Pazdziora (2):
set correct tagger for heirloom-pkgtools
Automatic commit of package [heirloom-pkgtools] minor release [1.070227-7].
---
rel-eng/packages/heirloom-pkgtools | 2 +-
spec-tree/heirloom-pkgtools/build.py.props | 3 +++
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 6 +++++-
3 files changed, 9 insertions(+), 2 deletions(-)
---
11 years, 4 months
2 commits - rel-eng/packages spec-tree/heirloom-pkgtools
by Jan Pazdziora
rel-eng/packages/heirloom-pkgtools | 2 +-
spec-tree/heirloom-pkgtools/build.py.props | 3 +++
spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec | 6 +++++-
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 0e2274cb8fbbc9cd43c5e4454e59f68fd03365c5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 10:03:48 2012 +0100
Automatic commit of package [heirloom-pkgtools] minor release [1.070227-7].
diff --git a/rel-eng/packages/heirloom-pkgtools b/rel-eng/packages/heirloom-pkgtools
index 9b208ad..c4ac6d5 100644
--- a/rel-eng/packages/heirloom-pkgtools
+++ b/rel-eng/packages/heirloom-pkgtools
@@ -1 +1 @@
-1.070227-6 spec-tree/heirloom-pkgtools/
+1.070227-7 spec-tree/heirloom-pkgtools/
diff --git a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
index e4e7da1..998b3c4 100644
--- a/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
+++ b/spec-tree/heirloom-pkgtools/heirloom-pkgtools.spec
@@ -6,7 +6,7 @@ Summary: Heirloom Packaging Tools
Group: Development/Tools
License: CDDL
Version: 1.%{heriloom_pkgtools_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
URL: http://heirloom.sourceforge.net/pkgtools.html
Source0: %{name}-%{heriloom_pkgtools_version}.tar.bz2
@@ -97,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/sadm/install/admin/default
%changelog
+* Tue Dec 11 2012 Jan Pazdziora 1.070227-7
+- set correct tagger for heirloom-pkgtools
+- set correct builder for heirloom-pkgtools
+
* Fri Feb 27 2009 Jan Pazdziora 1.070227-6
- fixed pkgmk producing wrong checksums in pkgmap on 64bit
commit da6328b4595434fb49510b9c67f8b6c5353137a6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 11 09:55:49 2012 +0100
set correct tagger for heirloom-pkgtools
diff --git a/spec-tree/heirloom-pkgtools/build.py.props b/spec-tree/heirloom-pkgtools/build.py.props
index 2222932..bce2f0f 100644
--- a/spec-tree/heirloom-pkgtools/build.py.props
+++ b/spec-tree/heirloom-pkgtools/build.py.props
@@ -1,3 +1,6 @@
[buildconfig]
builder = spacewalkx.builderx.NoTgzBuilder
+[buildconfig]
+tagger = spacewalk.releng.tagger.ReleaseTagger
+
11 years, 4 months