From bb04729f14a6e58a2d621c6fe1637bc4d055f43a Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 11 Oct 2005 23:33:38 +0000 Subject: [PATCH 1/5] Remove empty lines in the headers and switch scriplets to use ldconfig directly. --- yasm.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yasm.spec b/yasm.spec index cad9bba..794c81d 100644 --- a/yasm.spec +++ b/yasm.spec @@ -53,11 +53,9 @@ Install this package if you need to rebuild applications that use yasm. %{__rm} -rf %{buildroot} -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files From 2e7bc06621feb4f743f8040df35b920921bf1ed5 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 26 Feb 2007 19:31:06 +0000 Subject: [PATCH 2/5] Initialize branch EL-4 for yasm --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 728431aab372914b291b327cd2efbd7f96542046 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 5 Jun 2008 09:28:47 +0000 Subject: [PATCH 3/5] Update EL branches to the latest version for initial builds. --- .cvsignore | 2 +- sources | 2 +- yasm-0.4.0-genmacro.patch | 13 ------ yasm.spec | 83 ++++++++++++++++++++++++++++----------- 4 files changed, 62 insertions(+), 38 deletions(-) delete mode 100644 yasm-0.4.0-genmacro.patch diff --git a/.cvsignore b/.cvsignore index 011ad5b..eff0860 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -yasm-0.4.0.tar.gz +yasm-0.7.1.tar.gz diff --git a/sources b/sources index d3f3e7f..972483a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2360e20c4e105ba95f4e9135a7901183 yasm-0.4.0.tar.gz +fce21d066f4d04e3ec7f9318e6446e2b yasm-0.7.1.tar.gz diff --git a/yasm-0.4.0-genmacro.patch b/yasm-0.4.0-genmacro.patch deleted file mode 100644 index 113f399..0000000 --- a/yasm-0.4.0-genmacro.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- yasm-0.4.0/modules/preprocs/nasm/genmacro.c~ 2004-10-31 03:55:54.000000000 +0000 -+++ yasm-0.4.0/modules/preprocs/nasm/genmacro.c 2005-02-14 09:21:37.000000000 +0000 -@@ -102,8 +102,8 @@ - while (*strp == ' ' || *strp == '\t') - strp++; - len = strlen(strp); -- while (strp[len-1] == ' ' || strp[len-1] == '\t' || -- strp[len-1] == '\n') { -+ while (len && (strp[len-1] == ' ' || strp[len-1] == '\t' || -+ strp[len-1] == '\n')) { - strp[len-1] = '\0'; - len--; - } diff --git a/yasm.spec b/yasm.spec index 794c81d..9f84c5b 100644 --- a/yasm.spec +++ b/yasm.spec @@ -1,16 +1,15 @@ Summary: Complete rewrite of the NASM assembler Name: yasm -Version: 0.4.0 -Release: 2 -License: BSD +Version: 0.7.1 +Release: 1%{?dist} +# See COPYING for the detail, there is quite a lot! +License: BSD and (Artistic or GPLv2+ or LGPLv2+) and LGPLv2 Group: Development/Languages URL: http://www.tortall.net/projects/yasm/ Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz -Patch0: yasm-0.4.0-genmacro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, byacc, xmlto, gettext-devel - %description Yasm is a complete rewrite of the NASM assembler under the "new" BSD License (some portions are under other licenses, see COPYING for details). It is @@ -23,7 +22,7 @@ overall design is an optimizer module. %package devel Summary: Header files and static libraries for yasm Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel Yasm is a complete rewrite of the NASM assembler under the "new" BSD License @@ -36,8 +35,8 @@ Install this package if you need to rebuild applications that use yasm. %prep -%setup -%patch0 -p1 +%setup -q + %build %configure @@ -46,7 +45,7 @@ Install this package if you need to rebuild applications that use yasm. %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} %clean @@ -59,28 +58,66 @@ Install this package if you need to rebuild applications that use yasm. %files -%defattr(-, root, root, 0755) -%doc Artistic.txt AUTHORS BSD.txt ChangeLog COPYING GNU* NEWS README +%defattr(-,root,root,-) +%doc Artistic.txt AUTHORS BSD.txt COPYING GNU* %{_bindir}/yasm -%{_libdir}/*.so.* -%dir %{_libdir}/yasm/ -%{_libdir}/yasm/*.so %{_mandir}/man1/yasm.1* %files devel -%defattr(-, root, root, 0755) -%{_includedir}/libyasm.h +%defattr(-,root,root,-) %{_includedir}/libyasm/ -%{_libdir}/*.a -%exclude %{_libdir}/*.la -%{_libdir}/*.so -%dir %{_libdir}/yasm/ -%{_libdir}/yasm/*.a -%exclude %{_libdir}/yasm/*.la -%{_mandir}/man7/yasm_arch.7* +%{_includedir}/libyasm-stdint.h +%{_includedir}/libyasm.h +%{_libdir}/libyasm.a +%{_mandir}/man7/yasm_*.7* %changelog +* Tue May 20 2008 Matthias Saou 0.7.1-1 +- Update to 0.7.1. + +* Tue May 13 2008 Matthias Saou 0.7.0-1 +- Update to 0.7.0. + +* Tue Feb 19 2008 Fedora Release Engineering +- Autorebuild for GCC 4.3 + +* Mon Sep 24 2007 Matthias Saou 0.6.2-1 +- Update to 0.6.2. + +* Thu Aug 23 2007 Matthias Saou 0.6.1-3 +- Rebuild for new BuildID feature. + +* Fri Aug 3 2007 Matthias Saou 0.6.1-2 +- Update License field, it wasn't simply "BSD"... + +* Tue Jun 19 2007 Matthias Saou 0.6.1-1 +- Update to 0.6.1. + +* Sun Feb 25 2007 Matthias Saou 0.6.0-1 +- Update to 0.6.0. + +* Mon Aug 28 2006 Matthias Saou 0.5.0-2 +- FC6 rebuild. +- Require the same release in the devel sub-package. + +* Fri Jul 14 2006 Matthias Saou 0.5.0-1 +- Update to 0.5.0. +- Remove empty files from %%doc. +- There are no more shared libraries, only a static one, so update %%files. + +* Mon Mar 6 2006 Matthias Saou 0.4.0-6 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 0.4.0-5 +- Rebuild for new gcc/glibc. + +* Sun May 22 2005 Jeremy Katz - 0.4.0-4 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Mon Feb 14 2005 David Woodhouse 0.4.0-2 - Fix corruption in genmacro From 898efa4caba8768b6c420e036972ac5075b90b6e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:20 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e0f47c8..7a7e088 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: yasm -# $Id$ +# $Id: Makefile,v 1.1 2005/01/31 17:30:34 thias Exp $ NAME := yasm SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ef79c6f051f5a79fc2f26466e27b0a9fe3bcc748 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:19:27 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7a7e088..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yasm -# $Id: Makefile,v 1.1 2005/01/31 17:30:34 thias Exp $ -NAME := yasm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4