[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [MiNT] mintlib rpm fix



Here is a new version of my patch:

- it contains .cvsignore (no idea why it was not included)
- fixes math.h issue
- checked it works OK for all RPM builds

I left in the patch the NEWS -> ChangeLog replacement, too. After closer look it's quite consistent -- NEWS file contains only news for 0.55 mintlib, i.e. is everything but regular / complete. On the other hand, the check for NEWS stops building process because it wants to alert packager he should update it. It's clear nobody used it since 0.55 (we have 0.59 now, remember) so all at all, this code is useless because everybody who has made RPMs had to deactivate it. My patch changes it to check for ChangeLog, what is only remaining file which needs to be updated before release so it's quite useful.


--
MiKRO / Mystic Bytes
http://mikro.atari.org
? mintlib-0.59.0.tar.gz
Index: .cvsignore
===================================================================
RCS file: /mint/mintlib/.cvsignore,v
retrieving revision 1.4
diff -c -u -u -r1.4 .cvsignore
--- .cvsignore	27 Oct 2000 01:31:52 -0000	1.4
+++ .cvsignore	23 Jan 2010 19:51:09 -0000
@@ -2,4 +2,4 @@
 *~
 includepath
 CFILES
-00Patchlevel
+00PatchLevel
Index: Makefile
===================================================================
RCS file: /mint/mintlib/Makefile,v
retrieving revision 1.13
diff -c -u -u -r1.13 Makefile
--- Makefile	22 May 2009 18:29:06 -0000	1.13
+++ Makefile	23 Jan 2010 19:51:09 -0000
@@ -25,7 +25,7 @@
 SUBDIRS = include syscall startup argp conf crypt dirent gmp login mintlib \
   misc posix pwdgrp shadow signal socket stdiio stdio stdlib string sysvipc \
   termios time unix lib sunrpc tz
-DIST_SUBDIRS = argp conf crypt dirent gmp include lib lib_g lib_p lib020 libv4e \
+DIST_SUBDIRS = argp conf crypt dirent gmp include lib \
   login mintlib misc posix pwdgrp shadow signal socket startup \
   stdiio stdio stdlib string sunrpc syscall sysvipc termios time tz unix
 TEST_SUBDIRS = argp crypt dirent login mintlib misc posix pwdgrp shadow signal \
@@ -33,18 +33,22 @@
 
 ifeq ($(WITH_PROFILE_LIB), yes)
   SUBDIRS += lib_p
+  DIST_SUBDIRS += lib_p
 endif
 
 ifeq ($(WITH_DEBUG_LIB), yes)
   SUBDIRS += lib_g
+  DIST_SUBDIRS += lib_g
 endif
 
 ifeq ($(WITH_020_LIB), yes)
   SUBDIRS += lib020
+  DIST_SUBDIRS += lib020
 endif
 
 ifeq ($(WITH_V4E_LIB), yes)
   SUBDIRS += libv4e
+  DIST_SUBDIRS += libv4e
 endif
 
 include $(srcdir)/BINFILES
@@ -103,8 +107,8 @@
 	-rm -rf $(distdir)
 
 distdir: $(DISTFILES)
-	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
-	  echo "NEWS not updated; not releasing" 1>&2; \
+	@if sed 15q $(srcdir)/ChangeLog | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+	  echo "ChangeLog not updated; not releasing" 1>&2; \
 	  exit 1; \
 	fi
 	-rm -rf $(distdir)
@@ -131,8 +135,8 @@
 	-rm -rf $(bindistdir)
 
 bindistdir: $(BINDISTFILES)
-	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
-	  echo "NEWS not updated; not releasing" 1>&2; \
+	@if sed 15q $(srcdir)/ChangeLog | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+	  echo "ChangeLog not updated; not releasing" 1>&2; \
 	  exit 1; \
 	fi
 	-rm -rf $(bindistdir)
Index: include/EXTRAFILES
===================================================================
RCS file: /mint/mintlib/include/EXTRAFILES,v
retrieving revision 1.2
diff -c -u -u -r1.2 EXTRAFILES
--- include/EXTRAFILES	22 Feb 2002 23:08:15 -0000	1.2
+++ include/EXTRAFILES	23 Jan 2010 19:51:09 -0000
@@ -4,4 +4,5 @@
 SRCFILES += BINFILES EXTRAFILES Makefile SRCFILES \
 	\
 	features.h.in \
-	linker.h.in
+	linker.h.in \
+	math.h
Index: include/mint/.cvsignore
===================================================================
RCS file: /mint/mintlib/include/mint/.cvsignore,v
retrieving revision 1.2
diff -c -u -u -r1.2 .cvsignore
--- include/mint/.cvsignore	12 Mar 2002 16:21:14 -0000	1.2
+++ include/mint/.cvsignore	23 Jan 2010 19:51:09 -0000
@@ -1,3 +1,3 @@
 *~
 sysbind.h
-trap.h
+trap1*.h
Index: include/mint/MISCFILES
===================================================================
RCS file: /mint/mintlib/include/mint/MISCFILES,v
retrieving revision 1.11
diff -c -u -u -r1.11 MISCFILES
--- include/mint/MISCFILES	25 Nov 2008 14:22:34 -0000	1.11
+++ include/mint/MISCFILES	23 Jan 2010 19:51:09 -0000
@@ -27,5 +27,7 @@
 	sysbind.h \
 	sysctl.h \
 	sysvars.h \
-	trap.h \
+	trap1.h \
+	trap13.h \
+	trap14.h \
 	xbra.h
Index: syscall/EXTRAFILES
===================================================================
RCS file: /mint/mintlib/syscall/EXTRAFILES,v
retrieving revision 1.2
diff -c -u -u -r1.2 EXTRAFILES
--- syscall/EXTRAFILES	3 Jun 2002 12:50:53 -0000	1.2
+++ syscall/EXTRAFILES	23 Jan 2010 19:51:09 -0000
@@ -2,7 +2,6 @@
 # the files that should go only into source distributions.
 
 SRCFILES += BINFILES EXTRAFILES Makefile MISCFILES SRCFILES \
-check.c check.h generate.c generate.h list.c list.h main.c main.h \
+check.c check.h generate.c generate.h main.c \
 pars.y scan.l pars.h traps.c traps.h \
-syscalls.master
-
+syscallparser.c syscallparser.h syscalldefs.h syscalls.master
Index: syscall/traps.c
===================================================================
RCS file: /mint/mintlib/syscall/traps.c,v
retrieving revision 1.8
diff -c -u -u -r1.8 traps.c
--- syscall/traps.c	27 May 2009 22:27:54 -0000	1.8
+++ syscall/traps.c	23 Jan 2010 19:51:09 -0000
@@ -302,7 +302,6 @@
 		}
 
 		print_head(f, "gen-syscall");
-		fprintf(f, "#include <mint/trap.h>\n");
 		fprintf(f, "#include <compiler.h>\n");
 		fprintf(f, "\n");