diff options
| -rw-r--r-- | ChangeLog | 199 | ||||
| -rw-r--r-- | Makefile | 37 | ||||
| -rw-r--r-- | NEWS | 0 | ||||
| -rw-r--r-- | multiarch-utils.spec | 96 |
4 files changed, 9 insertions, 323 deletions
diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 470c47a..0000000 --- a/ChangeLog +++ /dev/null @@ -1,199 +0,0 @@ -2005-08-08 03:46 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.9-2mdk - -2005-08-07 18:13 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile: fix compat mode for 10.2 - -2005-08-07 18:04 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile, multiarch-utils.spec: adapt for rpm4.4 glob - /etc/rpm/macros.d/*.macros - -2005-08-07 17:47 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.9-1mdk - -2005-08-07 17:46 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-dispatch: handle symlinks to multiarch binaries and - cases where command name contains spaces - -2005-08-07 16:29 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files, mkmultiarch, multiarch-dispatch: Mandriva - Linux - -2005-03-10 12:19 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.8-1mdk - -2005-03-10 12:14 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: quotemeta RPM_BUILD_ROOT in regexp - -2005-02-24 10:16 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: next rpm release is actually 4.2.3-6mdk - -2005-02-24 10:02 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.7-1mdk - -2005-02-24 10:02 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: only check for multiarch files in the - usual development directories, new heuristics - -2005-02-24 10:01 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile, macros.multiarch: multiarch_distro is defined in the - Makefile - -2005-02-24 01:13 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile, multiarch-dispatch-host.def: dispatch x11 host.def - configs - -2005-02-24 01:12 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-dispatch.h: error out on unknown arch - -2005-02-16 14:15 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.6-1mdk, one last update - -2005-02-16 14:14 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: new multiarch keyword hint: BITS_PER_WORD - -2005-02-16 14:11 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.6-1mdk updates - -2005-02-10 18:25 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: handle --libtool in config scripts, better - heuristics (\s+display...) - -2005-02-09 09:56 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.6-1mdk - -2005-02-09 09:55 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: don't match */lib/{font,X11} in headers as - they shall be used for arch-independent data anyway - -2005-02-01 00:07 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.5-1mdk - -2005-02-01 00:00 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: better heuristics (e.g. gdlib-config, - mysql_config, pth-config) - -2005-01-31 23:59 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch: handle ciruclar inclusions (e.g. gd.h) - -2005-01-31 17:28 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch: sanity checks (file existence) - -2005-01-31 17:17 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.4-1mdk - -2005-01-31 17:15 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * macros.multiarch: add - multiarch_{platform,x11bindir,x11includedir} - -2005-01-31 17:09 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch: handle {relative, absolute} symlinks in binaries to - be dispatched - -2005-01-31 16:19 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch: handle /usr/include/header.h cases - -2005-01-25 14:11 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.3-1mdk - -2005-01-25 14:11 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files, macros.multiarch, multiarch-dispatch.h, - multiarch-platform: %multiarch_{bin,include}dir aliases, better - OS independence - -2005-01-24 22:35 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile: new file - -2005-01-24 22:35 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.2-1mdk - -2005-01-24 22:34 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * check-multiarch-files: add check-multiarch-files - -2005-01-20 23:56 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0.1-1mdk - -2005-01-20 23:53 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * macros.multiarch: add %multiarch annotation macro, it expands to - nothing on distros that aren't multiarch capable, i.e. MDK < - 10.2. - -2005-01-14 18:21 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile: new files and fix paths - -2005-01-14 16:29 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-utils.spec: 1.0-1mdk - -2005-01-14 16:29 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * macros.multiarch: rpm macros - -2005-01-14 16:29 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-dispatch: fix typo during post merge - -2005-01-13 00:42 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch: don't dispatch header file if it's already - dispatched to multiarch-ARCH-linux - -2005-01-12 18:56 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile, multiarch-utils.spec: fix packaging - -2005-01-12 18:48 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * Makefile, multiarch-utils.spec: packaging - -2005-01-12 18:26 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * multiarch-platform: multiarch-platform for base dir name - selection - -2005-01-12 18:22 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch, multiarch-dispatch, multiarch-dispatch.h: Initial - revision - -2005-01-12 18:22 Gwenole Beauchesne <gbeauchesne at mandriva.com> - - * mkmultiarch, multiarch-dispatch, multiarch-dispatch.h: initial - revision - @@ -15,19 +15,15 @@ RPM_BIN_FILES = mkmultiarch check-multiarch-files BINARIES = multiarch-platform multiarch-dispatch INCLUDES = multiarch-dispatch.h XCONFIGS = multiarch-dispatch-host.def -OTHER_FILES = Makefile multiarch-utils.spec ChangeLog +OTHER_FILES = Makefile NEWS FILES = $(foreach file,$(RPM_MACRO_FILES),macros.$(file)) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(XCONFIGS) $(OTHER_FILES) PACKAGE = multiarch-utils -VERSION := $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec) -RELEASE := $(shell rpm -q --qf %{RELEASE} --specfile $(PACKAGE).spec) -TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') -MULTIARCH_DIST := $(shell sed -n '/^%define *multiarch_distro *\([0-9]*\)/s//\1/p' $(PACKAGE).spec) - -RPMOPT = --clean --rmspec +VERSION = 1.0.9 +MULTIARCH_DIST = 1020 all: - @echo "nothing to be done for $(PACKAGE)-$(VERSION)-$(RELEASE)" + @echo "nothing to be done for $(PACKAGE)-$(VERSION)" clean: cleandist rm -f *~ @@ -50,11 +46,7 @@ install: -mkdir -p $(DESTDIR)$(prefix)/X11R6/lib/X11/config install -m644 $(XCONFIGS) $(DESTDIR)$(prefix)/X11R6/lib/X11/config/ -# rules to build a test rpm - -localrpm: localdist buildrpm - -localdist: cleandist dir localcopy tar +localdist: cleandist dir localcopy changelog tar cleandist: rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2 @@ -70,25 +62,14 @@ tar: bzip2 -9vf $(PACKAGE)-$(VERSION).tar rm -rf $(PACKAGE)-$(VERSION) -buildrpm: - rpm -ta $(PACKAGE)-$(VERSION).tar.bz2 - -# rules to build a distributable rpm - -rpm: changelog cvstag dist buildrpm - -dist: cleandist dir export tar +dist: cleandist export changelog tar export: - cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE) - -cvstag: - cvs tag $(CVSTAGOPT) $(TAG) + svn export -rBASE . $(PACKAGE)-$(VERSION) changelog: ../common/username - cvs2cl -U ../common/username -I ChangeLog - rm -f ChangeLog.bak - cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog + svn2cl --authors=../common/username --file=$(PACKAGE)-$(VERSION)/ChangeLog + rm -f $(PACKAGE)-$(VERSION)/ChangeLog.bak # Local variables: # mode: makefile diff --git a/multiarch-utils.spec b/multiarch-utils.spec deleted file mode 100644 index f232750..0000000 --- a/multiarch-utils.spec +++ /dev/null @@ -1,96 +0,0 @@ -%define name multiarch-utils -%define version 1.0.9 -%define release 2mdk -%define multiarch_distro 1020 - -Summary: Tools to help creation of multiarch binaries and includes -Name: %{name} -Version: %{version} -Release: %{release} -Source0: %{name}-%{version}.tar.bz2 -License: GPL -Group: Development/Other -Url: http://www.mandrivalinux.com/ -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%if %{mdkversion} >= %{multiarch_distro} -Conflicts: rpm < 4.2.3-6mdk -%endif -%if %{mdkversion} >= 200600 -Conflicts: rpm < 4.4 -%define macros %{_sysconfdir}/rpm/macros.d/multiarch.macros -%else -%define macros %{_sysconfdir}/rpm/macros.multiarch -%endif - -%description -multiarch-utils is a collection of helper utilities to dispatch -binaries and include files during RPM package build. - -%prep -%setup -q - -%build - -%install -rm -rf $RPM_BUILD_ROOT - -%makeinstall_std - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc ChangeLog -%{_bindir}/multiarch-platform -%{_bindir}/multiarch-dispatch -%{_includedir}/multiarch-dispatch.h -%{macros} -%{_prefix}/lib/rpm/mkmultiarch -%{_prefix}/lib/rpm/check-multiarch-files -%{_prefix}/X11R6/lib/X11/config/multiarch-dispatch-host.def - -%changelog -* Mon Aug 8 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.0.9-2mdk -- build fixes and use /etc/rpm/macros.d/* for MDV 2006 - -* Sun Aug 7 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.0.9-1mdk -- handle symlinks to multiarch binaries -- handle cases where multiarch binary name contains spaces - -* Thu Mar 10 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.8-1mdk -- quotemeta $RPM_BUILD_ROOT in regexp - -* Wed Feb 23 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.7-1mdk -- multiarch x11 host.def -- new heuristics for multiarch files checker (ace-config) -- only check for multiarch files in the usual development directories - -* Thu Feb 10 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.6-1mdk -- check-multiarch-files: new multiarch hint: BITS_PER_WORD -- check-multiarch-files: handle --libtool in config scripts -- check-multiarch-files: don't match */lib/{font,X11} in headers - -* Mon Jan 31 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.5-1mdk -- mkmultiarch: handle ciruclar inclusions (e.g. gd.h) -- check-multiarch-files: better heuristics (gdlib-config, mysql_config) - -* Mon Jan 31 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.4-1mdk -- mkmultiarch: handle /usr/include/header.h cases -- mkmultiarch: handle symlinks in binaries to be dispatched -- macros.multiarch: add multiarch_{platform,x11bindir,x11includedir} - -* Tue Jan 25 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.3-1mdk -- add %%multiarch_{bin,include}dir aliases -- better os independence, "linux" is detected - -* Mon Jan 24 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.2-1mdk -- add check-multiarch-files - -* Thu Jan 20 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.1-1mdk -- add %%multiarch macro to mark %%files that are multiarch enabled; - that's a helper macro that expands to nothing on older distributions - -* Wed Jan 12 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0-1mdk -- initial release |