aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2003-04-16 19:52:35 +0000
committerhpa <hpa>2003-04-16 19:52:35 +0000
commitb126993550a63b16bb6a35dac3f1b82dba0775f1 (patch)
tree5f21191f9cf80b728e1c61ead4a9833cfb58ddb1
parent31e884f23fddefb936708939f957363bd5d7f33a (diff)
downloadsyslinux.git-b126993550a63b16bb6a35dac3f1b82dba0775f1.tar.gz
syslinux.git-b126993550a63b16bb6a35dac3f1b82dba0775f1.tar.xz
syslinux.git-b126993550a63b16bb6a35dac3f1b82dba0775f1.zip
Hack around RPM versioning issues for now
-rw-r--r--Makefile.private5
-rw-r--r--syslinux.spec.in16
2 files changed, 15 insertions, 6 deletions
diff --git a/Makefile.private b/Makefile.private
index 03186e39..b33863d1 100644
--- a/Makefile.private
+++ b/Makefile.private
@@ -48,7 +48,7 @@ release:
xargs -0rt rm -f
find release/syslinux-$(VERSION) -name CVS -type d -print0 | \
xargs -0rt rm -rf
- sed -e 's/@@VERSION@@/$(VERSION)/g' \
+ sed -e 's/@@VERSION@@/$(VERSION)/g' -e 's/@@RPMVERSION@@/$(VERSION)/g' \
< release/syslinux-$(VERSION)/syslinux.spec.in \
> release/syslinux-$(VERSION)/syslinux.spec
rm -f release/syslinux-$(VERSION)/syslinux.spec.in
@@ -79,7 +79,8 @@ prerel:
xargs -0rt rm -f
find $(PRERELDIR)/$(PREREL) -name CVS -type d -print0 | \
xargs -0rt rm -rf
- sed -e 's/@@VERSION@@/$(RPMPREREL)/g' \
+ sed -e 's/@@VERSION@@/$(VERSION)-pre$(PRERELNO)/g' \
+ -e 's/@@RPMVERSION@@/$(RPMPREREL)/g' \
< $(PRERELDIR)/$(PREREL)/syslinux.spec.in \
> $(PRERELDIR)/$(PREREL)/syslinux.spec
rm -f $(PRERELDIR)/$(PREREL)/syslinux.spec.in
diff --git a/syslinux.spec.in b/syslinux.spec.in
index d8abc11e..e83d8452 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -1,14 +1,16 @@
# -*- rpm -*-
+%define RPMVERSION @@RPMVERSION@@
+%define VERSION @@VERSION@@
Summary: Kernel loader which uses a FAT or iso9660 filesystem or a PXE network
Name: syslinux
-Version: @@VERSION@@
+Version: %{RPMVERSION}
Release: 1
License: GPL
Group: Applications/System
-Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{VERSION}.tar.gz
ExclusiveArch: i386 x86_64
Packager: H. Peter Anvin <hpa@zytor.com>
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{VERSION}-root
BuildPrereq: nasm >= 0.98.35, perl
Autoreq: 0
%ifarch i386
@@ -25,7 +27,7 @@ PXE bootloader during network boots (PXELINUX), or for booting from
ISO 9660 CD-ROMs (ISOLINUX).
%prep
-%setup -q -n syslinux-%{version}
+%setup -q -n syslinux-%{VERSION}
%build
make clean
@@ -56,6 +58,12 @@ rm -rf %{buildroot}
%{_prefix}/lib/libsyslinux.*
%{_prefix}/include/syslinux.h
+%postin
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
%changelog
* Wed Apr 16 2003 H. Peter Anvin <hpa@zytor.com> 2.04-1
- 2.04 release