First build of rpm-4.2.

CVS patchset: 5786
CVS date: 2002/10/17 19:33:37

diff --git a/file/Makefile.am b/file/Makefile.am
index 8ab2b78..1c45904 100644 (file)
--- a/file/Makefile.am
+++ b/file/Makefile.am
@@ -5,17 +5,23 @@ EXTRA_DIST = LEGAL.NOTICE MAINT Makefile.std magic2mime magic.mime \
 
 BUILT_SOURCES = $(man_MANS) magic magic.mgc magic.mime.mgc
 
+noinst_HEADERS = debug.h names.h patchlevel.h readelf.h system.h tar.h \
+               file.h
+
 pkgincdir =    @includedir@/fmagic
-pkginc_HEADERS = file.h
+#pkginc_HEADERS = file.h
+
 
-noinst_HEADERS = debug.h names.h patchlevel.h readelf.h system.h tar.h
+#lib_LTLIBRARIES = libfmagic.la
+noinst_LTLIBRARIES = libfmagic.la
 
-lib_LTLIBRARIES = libfmagic.la
 libfmagic_la_SOURCES = \
        apprentice.c ascmagic.c fsmagic.c compress.c \
        print.c readelf.c softmagic.c
 
-bin_PROGRAMS = file
+#bin_PROGRAMS =        file
+noinst_PROGRAMS =      file
+
 file_SOURCES = file.c
 file_LDFLAGS = -all-static
 file_LDADD =   libfmagic.la
@@ -23,7 +29,8 @@ file_LDADD =  libfmagic.la
 data_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 man_MAGIC = magic.@fsect@
-man_MANS = file.1 $(man_MAGIC)
+#man_MANS = file.1 $(man_MAGIC)
+noinst_MANS = file.1 $(man_MAGIC)
 
 MAGIC   = @datadir@/magic
 CPPFLAGS = -DMAGIC='"$(MAGIC)"'

diff --git a/rpm.spec.in b/rpm.spec.in
index 5b68d5b..6925c20 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -119,6 +119,11 @@ shell-like rules.
 %build
 
 %ifos linux
+%ifarch x86_64 s390 s390x 
+CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
+%else
+CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
+%endif
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man' --with-python=%{with_python_version} --without-javaglue
 %else
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix}
@@ -160,6 +165,14 @@ done
 gzip -9n apidocs/man/man*/* || :
 %endif
 
+# XXX FIXME: hack to get libraries in the right place
+if [ ! -d $RPM_BUILD_ROOT/%{__prefix}/%{_lib} ]; then
+  mkdir -p $RPM_BUILD_ROOT/%{__prefix}/%{_lib}
+  mv $RPM_BUILD_ROOT/usr/lib/*so*  $RPM_BUILD_ROOT/%{__prefix}/%{_lib}
+  mv $RPM_BUILD_ROOT/usr/lib/*.a  $RPM_BUILD_ROOT/%{__prefix}/%{_lib}
+  mv $RPM_BUILD_ROOT/usr/lib/*.la  $RPM_BUILD_ROOT/%{__prefix}/%{_lib}
+fi
+
 # Get rid of unpackaged files
 { cd $RPM_BUILD_ROOT
   rm -rf .%{__prefix}/include/beecrypt
@@ -169,17 +182,17 @@ gzip -9n apidocs/man/man*/* || :
   rm -f .%{__prefix}/lib/rpm/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req}
   rm -rf .%{__prefix}%{__share}/man/{fr,ko}
 
- for f in elflint file ld nm readelf size strip; do
-  rm -rf .%{__prefix}/bin/$f
- done
- for f in dwarf.h elf-knowledge.h fmagic gelf.h libasm.h libdwarf.h libebl.h libelf.h nlist.h; do
-  rm -rf .%{__prefix}/include/$f
- done
- for f in libasm libdwarf libebl libelf libfmagic libld; do
-  rm -rf .%{__prefix}/lib/${f}*
- done
- rm -f .%{__prefix}/share/magic*
- rm -f .%{__prefix}/share/man/man1/file.1*
+# for f in elflint file ld nm readelf size strip; do
+#  rm -rf .%{__prefix}/bin/$f
+# done
+# for f in dwarf.h elf-knowledge.h fmagic gelf.h libasm.h libdwarf.h libebl.h libelf.h nlist.h; do
+#  rm -rf .%{__prefix}/include/$f
+# done
+# for f in libasm libdwarf libebl libelf libfmagic libld; do
+#  rm -rf .%{__prefix}/lib/${f}*
+# done
+# rm -f .%{__prefix}/share/man/man1/file.1*
+  rm -f .%{__prefix}/share/magic*
 }
 
 %clean