[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/lib/ rpmfc.c rpmfc.h rpm/macros/ ...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Ãyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Apr-2011 04:03:43 Branch: rpm-5_4 Handle: 2011040102034201 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/lib rpmfc.c rpmfc.h rpm/macros ruby.in Log: enable ruby file classifier & internal dep generator. Summary: RevisionChanges Path 1.3501.2.87 +1 -0 rpm/CHANGES 1.75.2.1+22 -2 rpm/lib/rpmfc.c 1.19.4.1+2 -1 rpm/lib/rpmfc.h 1.4.2.1 +2 -2 rpm/macros/ruby.in patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.86 -r1.3501.2.87 CHANGES --- rpm/CHANGES 31 Mar 2011 07:38:38 - 1.3501.2.86 +++ rpm/CHANGES 1 Apr 2011 02:03:42 - 1.3501.2.87 @@ -1,4 +1,5 @@ 5.4.0 -> 5.4.1: +- proyvind: rpmfc: enable ruby file classifier & internal dep generator. - devzero2000: misread the review, repost as the original patch - devzero2000: change the order for the _initddir macro assignment - proyvind: mandriva: add systemd macros (mdvbz#62741, from Andrey Borzenkov). @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.c $ cvs diff -u -r1.75 -r1.75.2.1 rpmfc.c --- rpm/lib/rpmfc.c 19 Oct 2010 02:34:04 - 1.75 +++ rpm/lib/rpmfc.c 1 Apr 2011 02:03:43 - 1.75.2.1 @@ -576,6 +576,9 @@ { "Mono/.Net assembly",RPMFC_MONO|RPMFC_INCLUDE }, + { "ruby script text", RPMFC_RUBY|RPMFC_INCLUDE }, + { "Ruby script text", RPMFC_RUBY|RPMFC_INCLUDE }, + { "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE }, { "Zip archive data", RPMFC_COMPRESSED|RPMFC_ARCHIVE|RPMFC_INCLUDE }, @@ -810,6 +813,8 @@ fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON; else if (!strncmp(bn, "php", sizeof("php")-1)) fc->fcolor->vals[fc->ix] |= RPMFC_PHP; + else if (!strncmp(bn, "ruby", sizeof("ruby")-1)) + fc->fcolor->vals[fc->ix] |= RPMFC_RUBY; break; } @@ -865,7 +870,15 @@ xx = rpmfcHelper(fc, 'P', "mono"); if (is_executable) xx = rpmfcHelper(fc, 'R', "mono"); -} +} else +if (fc->fcolor->vals[fc->ix] & RPMFC_RUBY) { + xx = rpmfcHelper(fc, 'P', "ruby"); +#ifdef NOTYET + if (is_executable) +#endif + xx = rpmfcHelper(fc, 'R', "ruby"); +} else + /*@-observertrans@*/ defaultdocdir = _free(defaultdocdir) ; /*@=observertrans@*/ @@ -954,7 +967,7 @@ /*@unchecked@*/ static struct rpmfcApplyTbl_s rpmfcApplyTable[] = { { rpmfcELF, RPMFC_ELF }, -{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO) }, +{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_RUBY) }, { NULL, 0 } }; /*@=nullassign@*/ @@ -1022,6 +1035,13 @@ fn += 2; if (!strncmp(fn, "/python", sizeof("/python")-1)) fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON; + else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) { + const char *gem = strstr(fn, "specifications"); + fc->fcolor->vals[fc->ix] |= RPMFC_RUBY; + if (gem && (gem = strstr(gem, ".gemspec")) && + gem[sizeof(".gemspec")-1] == '\0') + fc->fcolor->vals[fc->ix] |= RPMFC_MODULE; + } } } @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.h $ cvs diff -u -r1.19 -r1.19.4.1 rpmfc.h --- rpm/lib/rpmfc.h 6 Mar 2010 15:31:29 - 1.19 +++ rpm/lib/rpmfc.h 1 Apr 2011 02:03:43 - 1.19.4.1 @@ -24,7 +24,8 @@ #define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32) /* (1 << 3) leaks into package headers, reserved */ - /* bits 4-7 unused */ + /* bits 4-6 unused */ +RPMFC_RUBY = (1 << 7), RPMFC_PKGCONFIG = (1 << 8), RPMFC_LIBTOOL= (1 << 9), RPMFC_BOURNE = (1 << 10), @@ . patch -p0 <<'@@ .' Index: rpm/macros/ruby.in
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/lib/ rpmfc.c rpmfc.h rpm/macros/ ...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 22-Apr-2012 19:07:08 Branch: rpm-5_4 Handle: 2012042217070602 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/lib rpmfc.c rpmfc.h rpm/macros macros.in Log: haskell dependency generation Submitted by: mdawkins Summary: RevisionChanges Path 1.3501.2.243+1 -0 rpm/CHANGES 1.75.2.14 +11 -1 rpm/lib/rpmfc.c 1.19.4.4+3 -2 rpm/lib/rpmfc.h 1.39.2.27 +5 -1 rpm/macros/macros.in patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.242 -r1.3501.2.243 CHANGES --- rpm/CHANGES 22 Apr 2012 16:43:06 - 1.3501.2.242 +++ rpm/CHANGES 22 Apr 2012 17:07:06 - 1.3501.2.243 @@ -1,4 +1,5 @@ 5.4.8 -> 5.4.9: +- mdawkins: haskell dependencies - mdawkins: typelib G-IR - jbj: fix: finish wireing up Alt set:versions. a bit more todo++. - jbj: rpmfc: fix: OS X (and *BSD) are sighandler_t challenged. @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.c $ cvs diff -u -r1.75.2.13 -r1.75.2.14 rpmfc.c --- rpm/lib/rpmfc.c 21 Apr 2012 00:37:44 - 1.75.2.13 +++ rpm/lib/rpmfc.c 22 Apr 2012 17:07:07 - 1.75.2.14 @@ -911,6 +911,10 @@ #endif xx = rpmfcHelper(fc, 'R', "ruby"); } else +if (fc->fcolor->vals[fc->ix] & RPMFC_HASKELL) { + xx = rpmfcHelper(fc, 'P', "haskell"); + xx = rpmfcHelper(fc, 'R', "haskell"); +} else if (fc->fcolor->vals[fc->ix] & RPMFC_TYPELIB) { xx = rpmfcHelper(fc, 'P', "typelib"); #ifdef NOTYET @@ -1044,7 +1048,7 @@ /*@unchecked@*/ static struct rpmfcApplyTbl_s rpmfcApplyTable[] = { { rpmfcELF, RPMFC_ELF }, -{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB) }, +{ rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_HASKELL|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB) }, #if defined(RPM_VENDOR_MANDRIVA) { rpmfcSYMLINK, RPMFC_SYMLINK }, #endif @@ -1128,6 +1132,12 @@ } } + /* XXX ugly quick & dirty integration of haskell() dependencies */ + { fn = strstr(fc->fn[fc->ix], "/usr/share/haskell-deps"); + if (fn) + fc->fcolor->vals[fc->ix] |= RPMFC_HASKELL; + } + if (fc->fcolor->vals[fc->ix]) for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) { if (!(fc->fcolor->vals[fc->ix] & fcat->colormask)) @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.h $ cvs diff -u -r1.19.4.3 -r1.19.4.4 rpmfc.h --- rpm/lib/rpmfc.h 20 Apr 2012 18:40:52 - 1.19.4.3 +++ rpm/lib/rpmfc.h 22 Apr 2012 17:07:07 - 1.19.4.4 @@ -24,8 +24,9 @@ #define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32) /* (1 << 3) leaks into package headers, reserved */ - /* bits 4-5 unused */ -RPMFC_TYPELIB= (1 << 6), + /* bit 4 unused */ +RPMFC_TYPELIB= (1 << 5), +RPMFC_HASKELL= (1 << 6), RPMFC_RUBY = (1 << 7), RPMFC_PKGCONFIG = (1 << 8), RPMFC_LIBTOOL= (1 << 9), @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in $ cvs diff -u -r1.39.2.26 -r1.39.2.27 macros.in --- rpm/macros/macros.in 22 Apr 2012 16:43:07 - 1.39.2.26 +++ rpm/macros/macros.in 22 Apr 2012 17:07:08 - 1.39.2.27 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.26 2012/04/22 16:43:07 mdawkins Exp $ +# $Id: macros.in,v 1.39.2.27 2012/04/22 17:07:08 mdawkins Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -996,6 +996,10 @@ #%%{load:%{_usrlibrpm}/macros.d/gstreamer} # +# haskell(...) configuration. +#%%{load:%{_usrlibrpm}/macros.d/ha