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
Show replies by date