aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexter Morgan <dmorgan@mageia.org>2013-07-05 11:11:59 (GMT)
committerDexter Morgan <dmorgan@mageia.org>2013-07-05 11:11:59 (GMT)
commite6e28c55e3f2bd542b3fb9d4934c72b535c3f0d8 (patch)
tree1db87a00ec01ec4dd4a8fc02bc48c7e91c9b50f4
parente0c8488a8838b6e2cc06b7b043f0ab13b36a2387 (diff)
- Add auto requires for osgi() mvn()1.173
-rw-r--r--NEWS3
-rw-r--r--configure.ac2
-rwxr-xr-xfind-requires.in27
3 files changed, 31 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ee3d1e5..81ef9a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.173 - 5 July 2013, by D.Morgan
+- Add auto requires for osgi() mvn()
+
Version 1.172 - 4 June 2013, by Colin Guthrie
- add pkgconfig package requires for private requires
diff --git a/configure.ac b/configure.ac
index 164e96b..7b95360 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.172, rtp@mageia.org)
+AC_INIT(rpm-mageia-setup, 1.173, dmorgan@mageia.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR
diff --git a/find-requires.in b/find-requires.in
index 1e76523..fe7f8da 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -50,6 +50,9 @@ liblist=`echo "$filelist" | egrep -v "/usr/lib(64)?/gcj/" | xargs -r file | \
ocamllist=`echo "$filelist" | xargs -r file | \
grep ":.*Objective caml interface file" | cut -d : -f1`
phplist=`echo "$filelist" | grep -v /usr/doc | grep -v /usr/share/doc | egrep "\.php$"`
+mavenlist=$(echo "$filelist" |egrep '/usr/share/maven-fragments/*')
+osgilist=$(echo "$filelist" |egrep "^(.*\.jar|((/usr/lib(64)|/usr/share).*/MANIFEST.MF))")
+javadoclist=$(echo "$filelist" |egrep '/usr/share/javadoc/*')
interplist=
perllist=
@@ -326,5 +329,29 @@ echo $filelist | tr '[:blank:]' '\n' | /usr/bin/haskell-find-requires \
&& test ${PIPESTATUS[2]} -ne 0 && echo 'error: /usr/bin/haskell-find-requires failed' >&2 && exit 1
fi
+# --- osgi requires
+if [ -x @RPMLIBDIR@/osgi.req ];then
+ if [ ! -z "$osgilist" ]; then
+ echo "$osgilist" | tr '[:blank:]' '\n' | @RPMLIBDIR@/osgi.req \
+ && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/osgi.req failed' >&2 && exit 1
+ fi
+fi
+
+#
+# --- maven requires
+if [ -x @RPMLIBDIR@/maven.req ];then
+ if [ ! -z "$mavenlist" ]; then
+ echo "$mavenlist" | tr '[:blank:]' '\n' | @RPMLIBDIR@/maven.req \
+ && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/maven.req failed' >&2 && exit 1
+ fi
+fi
+
+# --- javadoc requires
+if [ -x @RPMLIBDIR@/javadoc.req ];then
+ if [ ! -z "$javadoclist" ]; then
+ echo "$javadoclist" | tr '[:blank:]' '\n' | @RPMLIBDIR@/javadoc.req \
+ && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/javadoc.req failed' >&2 && exit 1
+ fi
+fi
exit 0