rpms/globus-core/EL-5 globus-core-ar-ranlib.patch, NONE, 1.1 globus-core-mingw.patch, NONE, 1.1 globus-core-platforms.patch, NONE, 1.1 globus-core-compat.patch, 1.1, 1.2 globus-core.spec, 1.4, 1.5 globus-spec-creator, 1.1, 1.2 import.log, 1.4, 1.5
Mattias Ellert
ellert at fedoraproject.org
Mon Jun 15 15:13:01 UTC 2009
- Previous message (by thread): rpms/globus-core/EL-4 globus-core-ar-ranlib.patch, NONE, 1.1 globus-core-mingw.patch, NONE, 1.1 globus-core-platforms.patch, NONE, 1.1 globus-core-compat.patch, 1.1, 1.2 globus-core.spec, 1.4, 1.5 globus-spec-creator, 1.1, 1.2 import.log, 1.4, 1.5
- Next message (by thread): rpms/jhead/EL-5 .cvsignore, 1.9, 1.10 jhead.spec, 1.18, 1.19 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17028/EL-5
Modified Files:
globus-core-compat.patch globus-core.spec globus-spec-creator
import.log
Added Files:
globus-core-ar-ranlib.patch globus-core-mingw.patch
globus-core-platforms.patch
Log Message:
* Tue Jun 02 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-5
- Update to official Fedora Globus packaging guidelines
- Fix build configuration for s390x and kfreebsd
- Make globus-core work with automake 1.11
globus-core-ar-ranlib.patch:
--- NEW FILE globus-core-ar-ranlib.patch ---
diff -ur globus_core-5.15.orig/config/accompiler.m4 globus_core-5.15/config/accompiler.m4
--- globus_core-5.15.orig/config/accompiler.m4 2009-05-01 07:37:42.000000000 +0200
+++ globus_core-5.15/config/accompiler.m4 2009-05-01 10:44:12.000000000 +0200
@@ -1099,12 +1099,11 @@
AC_SUBST(cross_compiling)
dnl Note that if RANLIB is set appropriately
dnl This line should do nothing
-AC_PATH_PROGS(lac_cv_RANLIB, $lac_cv_RANLIB ranlib true, true)
+AC_PATH_PROGS(lac_cv_RANLIB, $RANLIB ranlib true, true)
dnl Only set AR if it has not been explicitly set earlier
-AR="$lac_cv_AR"
if test "x$lac_cv_AR" = "x"; then
- AC_PATH_PROGS(lac_cv_AR, [ar], ar)
+ AC_PATH_PROGS(lac_cv_AR, $AR ar, ar)
fi
AC_CACHE_VAL(lac_cv_ARFLAGS, lac_cv_ARFLAGS="ruv")
NM="$lac_NM"
globus-core-mingw.patch:
--- NEW FILE globus-core-mingw.patch ---
diff -ur globus_core-5.15.orig/config/acplatforms.m4 globus_core-5.15/config/acplatforms.m4
--- globus_core-5.15.orig/config/acplatforms.m4 2005-11-02 23:25:26.000000000 +0100
+++ globus_core-5.15/config/acplatforms.m4 2009-05-09 23:21:28.000000000 +0200
@@ -105,6 +105,10 @@
AC_DEFINE(TARGET_ARCH_NETOS)
AC_DEFINE(TARGET_ARCH_ARM)
;;
+ *mingw32* )
+ AC_DEFINE(TARGET_ARCH_WIN32)
+ AC_DEFINE(TARGET_ARCH_X86)
+ ;;
* )
echo "platform not configured with TARGET_ARCH_*"
;;
diff -ur globus_core-5.15.orig/config/acthreads.m4 globus_core-5.15/config/acthreads.m4
--- globus_core-5.15.orig/config/acthreads.m4 2009-05-09 23:20:07.000000000 +0200
+++ globus_core-5.15/config/acthreads.m4 2009-05-09 23:21:23.000000000 +0200
@@ -56,6 +56,9 @@
sproc)
LAC_THREADS_SPROC
;;
+ windows)
+ LAC_THREADS_WINDOWS
+ ;;
external)
LAC_THREADS_EXTERNAL
;;
@@ -400,6 +403,19 @@
])
+dnl LAC_THREADS_WINDOWS
+AC_DEFUN([LAC_THREADS_WINDOWS],
+[
+if test "$lac_cv_threads_type" = "windows"; then
+ found_inc="yes"
+ found_lib="yes"
+
+ lac_cv_threads_type="windows"
+ LAC_THREADS_ADD_DEFINE(HAVE_WINDOWS_THREADS)
+ lac_cv_threads_LIBS=""
+ lac_cv_threads_CFLAGS="-DWINVER=0x0502"
+fi
+])
dnl LAC_THREADS_ADD_DEFINE(SYMBOL)
dnl If you add a define for a new SYMBOL, you need to add that symbol
@@ -418,6 +434,7 @@
LAC_THREADS_DEFINE_ONE(HAVE_SOLARISTHREADS)
LAC_THREADS_DEFINE_ONE(HAVE_PTHREAD)
LAC_THREADS_DEFINE_ONE(HAVE_SPROC)
+ LAC_THREADS_DEFINE_ONE(HAVE_WINDOWS_THREADS)
LAC_THREADS_DEFINE_ONE(HAVE_EXTERNALTHREADS)
LAC_THREADS_DEFINE_ONE(HAVE_PTHREAD_DRAFT_4)
LAC_THREADS_DEFINE_ONE(HAVE_PTHREAD_DRAFT_6)
diff -ur globus_core-5.15.orig/globus_config.h.in globus_core-5.15/globus_config.h.in
--- globus_core-5.15.orig/globus_config.h.in 2009-05-09 23:20:07.000000000 +0200
+++ globus_core-5.15/globus_config.h.in 2009-05-09 23:21:28.000000000 +0200
@@ -31,6 +31,7 @@
#undef _POSIX_PTHREAD_SEMANTICS
#undef HAVE_SOLARISTHREADS
#undef HAVE_SPROC
+#undef HAVE_WINDOWS_THREADS
#undef HAVE_THREAD_SAFE_SELECT
#undef HAVE_THREAD_SAFE_STDIO
#undef _CMA_REENTRANT_CLIB_
@@ -73,6 +74,7 @@
#undef TARGET_ARCH_X86
#undef TARGET_ARCH_IA64
#undef TARGET_ARCH_ARM
+#undef TARGET_ARCH_WIN32
#ifdef NET_OS
#undef TARGET_ARCH_NETOS
globus-core-platforms.patch:
--- NEW FILE globus-core-platforms.patch ---
diff -ur globus_core-5.15.orig/config/accompiler.m4 globus_core-5.15/config/accompiler.m4
--- globus_core-5.15.orig/config/accompiler.m4 2009-06-02 20:25:05.000000000 +0200
+++ globus_core-5.15/config/accompiler.m4 2009-06-02 20:27:36.000000000 +0200
@@ -451,6 +451,33 @@
fi
CC="$lac_cv_CC"
;;
+ s390x-*-linux* )
+ if test "$GLOBUS_CC" = "mpicc"; then
+ AC_PATH_PROGS(lac_cv_CC, $CC mpicc)
+ AC_PATH_PROGS(lac_cv_CXX, $CXX mpicxx mpic++ mpiCC)
+ AC_PATH_PROGS(lac_cv_F77, $F77 mpif77)
+ AC_PATH_PROGS(lac_cv_F90, $F90 mpif90)
+ else
+ if test "$GLOBUS_CC" != "gcc"; then
+ AC_MSG_ERROR(vendorcc not supported on this platform)
+ fi
+
+ if test "$lac_cv_build_64bit" = "yes"; then
+ lac_CFLAGS="$lac_CFLAGS -m64"
+ lac_CXXFLAGS="$lac_CXXFLAGS -m64"
+ lac_LDFLAGS="$lac_LDFLAGS -m64"
+ else
+ lac_CFLAGS="$lac_CFLAGS -m32"
+ lac_CXXFLAGS="$lac_CXXFLAGS -m32"
+ lac_LDFLAGS="$lac_LDFLAGS -m32"
+ fi
+ AC_PATH_PROGS(lac_cv_CC, $CC gcc)
+ AC_PATH_PROGS(lac_cv_CXX, $CXX c++ g++)
+ AC_PATH_PROGS(lac_cv_F77, $F77 f77 g77)
+ AC_PATH_PROGS(lac_cv_F90, $F90 f90)
+ fi
+ CC="$lac_cv_CC"
+ ;;
alpha*linux* )
if test "$lac_cv_build_64bit" = "no"; then
AC_MSG_ERROR(32 bits not supported on this platform)
@@ -1011,6 +1038,56 @@
fi
CC="$lac_cv_CC"
;;
+ x86_64-*-k*bsd*-gnu* )
+ if test "$GLOBUS_CC" = "mpicc"; then
+ AC_PATH_PROGS(lac_cv_CC, $CC mpicc)
+ AC_PATH_PROGS(lac_cv_CXX, $CXX mpicxx mpic++ mpiCC)
+ AC_PATH_PROGS(lac_cv_F77, $F77 mpif77)
+ AC_PATH_PROGS(lac_cv_F90, $F90 mpif90)
+ else
+ if test "$GLOBUS_CC" != "gcc"; then
+ AC_MSG_ERROR(vendorcc not supported on this platform)
+ fi
+
+ if test "$lac_cv_build_64bit" = "yes"; then
+ lac_CFLAGS="$lac_CFLAGS -m64"
+ lac_CXXFLAGS="$lac_CXXFLAGS -m64"
+ lac_LDFLAGS="$lac_LDFLAGS -m64"
+ else
+ lac_CFLAGS="$lac_CFLAGS -m32"
+ lac_CXXFLAGS="$lac_CXXFLAGS -m32"
+ lac_LDFLAGS="$lac_LDFLAGS -m32"
+ fi
+ AC_PATH_PROGS(lac_cv_CC, $CC gcc)
+ AC_PATH_PROGS(lac_cv_CXX, $CXX c++ g++)
+ AC_PATH_PROGS(lac_cv_F77, $F77 f77 g77)
+ AC_PATH_PROGS(lac_cv_F90, $F90 f90)
+ fi
+ CC="$lac_cv_CC"
+ ;;
+ *-*-k*bsd*-gnu* )
+ if test "$lac_cv_build_64bit" = "yes"; then
+ AC_MSG_ERROR(64 bits not supported on this platform)
+ exit 1
+ fi
+
+ if test "$GLOBUS_CC" = "mpicc"; then
+ AC_PATH_PROGS(lac_cv_CC, $CC mpicc)
+ AC_PATH_PROGS(lac_cv_CXX, $CXX mpicxx mpic++ mpiCC)
+ AC_PATH_PROGS(lac_cv_F77, $F77 mpif77)
+ AC_PATH_PROGS(lac_cv_F90, $F90 mpif90)
+ else
+ if test "$GLOBUS_CC" != "gcc"; then
+ AC_MSG_ERROR(vendorcc not supported on this platform)
+ fi
+
+ AC_PATH_PROGS(lac_cv_CC, $CC gcc)
+ AC_PATH_PROGS(lac_cv_CXX, $CXX $CCC g++ gcc)
+ AC_PATH_PROGS(lac_cv_F77, $F77 g77 f77)
+ AC_PATH_PROGS(lac_cv_F90, $F90 f90)
+ fi
+ CC="$lac_cv_CC"
+ ;;
* )
dnl No 64bit support yet
if test "$lac_cv_build_64bit" = "yes"; then
globus-core-compat.patch:
Index: globus-core-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-core-compat.patch 20 Mar 2009 07:33:41 -0000 1.1
+++ globus-core-compat.patch 15 Jun 2009 15:13:00 -0000 1.2
@@ -1,6 +1,6 @@
diff -ur globus_core-5.15.orig/pkgdata/Makefile.am globus_core-5.15/pkgdata/Makefile.am
--- globus_core-5.15.orig/pkgdata/Makefile.am 2006-01-12 18:12:52.000000000 +0100
-+++ globus_core-5.15/pkgdata/Makefile.am 2008-12-08 23:22:23.000000000 +0100
++++ globus_core-5.15/pkgdata/Makefile.am 2009-06-15 14:57:39.000000000 +0200
@@ -44,12 +44,12 @@
install-pkgDATA: $(pkg_DATA)
@@ -9,9 +9,10 @@ diff -ur globus_core-5.15.orig/pkgdata/M
+ test -z "$(pkgdir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdir)";
@list='$(pkg_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
+- f=$(am__strip_dir) \
- echo " $(pkgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
- $(pkgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
++ f=`echo $$p | sed -e 's|^.*/||'`; \
+ echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
done || true
Index: globus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-core.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-core.spec 27 Apr 2009 16:54:44 -0000 1.4
+++ globus-core.spec 15 Jun 2009 15:13:00 -0000 1.5
@@ -13,7 +13,7 @@
Name: globus-core
%global _name %(tr - _ <<< %{name})
Version: 5.15
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Globus Toolkit - Globus Core
Group: Development/Tools
@@ -25,7 +25,9 @@ URL: http://www.globus.org/
# mv gt4.2.1-all-source-installer/source-trees/core/source globus_core-5.15
# tar -zcf globus_core-5.15.tar.gz globus_core-5.15
Source: %{_name}-%{version}.tar.gz
+# GPT metadata to pkg-config file converter
Source1: globus-gpt2pkg-config
+# Globus RPM specfile creator script
Source2: globus-spec-creator
# Make file locations configurable:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6451
@@ -51,22 +53,34 @@ Patch6: %{name}-helpstring.patch
# Fix doxygen documentation installation instructions:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6458
Patch7: %{name}-doxygen.patch
-# Make it work with older automake versions:
+# Make it work with older and newer automake versions:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6565
Patch8: %{name}-compat.patch
# Avoid race condition when renaming the libtool file:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6575
Patch9: %{name}-libtool.patch
+# Properly propagate $AR and $RANLIB:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6739
+Patch10: %{name}-ar-ranlib.patch
+# Fixes for mingw compilation:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch11: %{name}-mingw.patch
+# Fix build configuration for s390x and kfreebsd:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6754
+Patch12: %{name}-platforms.patch
# Adapt dependency script to Fedora's documentation location:
# Not relevant for upstream - not submitted to globus bugzilla
-Patch10: %{name}-fedora.patch
+Patch13: %{name}-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: %{name}-devel = %{version}-%{release}
Obsoletes: %{name}-devel < 5.15-0.5
Requires: pkgconfig
+Requires: perl(XML::DOM)
+Requires: perl(XML::Parser)
BuildRequires: grid-packaging-tools
BuildRequires: perl(XML::DOM)
+BuildRequires: perl(XML::Parser)
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -89,7 +103,10 @@ Globus Core
%patch7 -p1 -b .doxygen
%patch8 -p1 -b .compat
%patch9 -p1 -b .libtool
-%patch10 -p1 -b .fedora
+%patch10 -p1 -b .ranlib
+%patch11 -p1 -b .mingw
+%patch12 -p1 -b .platform
+%patch13 -p1 -b .fedora
# custom perl requires that removes dependency on gpt perl modules
cat << EOF > %{name}-req
@@ -125,6 +142,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
# These scripts are intended to be sourced, not executed
chmod 644 $RPM_BUILD_ROOT%{_datadir}/globus/globus-build-env-*.sh
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
# Add -Wl,--as-needed to the libtool script if supported
%if %{?fedora}%{!?fedora:0} >= 2
sed 's! -shared ! \\\${wl}--as-needed&!g' \
@@ -151,19 +170,18 @@ $RPM_BUILD_ROOT%{_datadir}/globus/globus
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
# Remove license file installed directly in the buildroot
-rm $RPM_BUILD_ROOT/GLOBUS_LICENSE
-sed /GLOBUS_LICENSE/d \
- -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist
+rm -f $RPM_BUILD_ROOT/GLOBUS_LICENSE
+sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist
# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
# Generate package filelists
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \
- $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
- $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
- $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_data.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
+ $GLOBUSPACKAGEDIR/%{_name}/noflavor_data.filelist \
| sed s!^!%{_prefix}! > package.filelist
%clean
@@ -187,6 +205,11 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%changelog
+* Tue Jun 02 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-5
+- Update to official Fedora Globus packaging guidelines
+- Fix build configuration for s390x and kfreebsd
+- Make globus-core work with automake 1.11
+
* Mon Apr 27 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.15-4
- Install the globus-spec-creator script
- Add -Wl,--as-needed to the libtool script
Index: globus-spec-creator
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/globus-spec-creator,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-spec-creator 27 Apr 2009 16:54:44 -0000 1.1
+++ globus-spec-creator 15 Jun 2009 15:13:00 -0000 1.2
@@ -320,17 +320,10 @@ else {
}
if ($docpkg) {
print "BuildRequires:\tdoxygen\n";
- print "%if %{?fedora}%{!?fedora:0} >= 3\n";
- print "BuildRequires:\tgraphviz\n";
- print "BuildRequires:\tghostscript\n";
- print "%else\n";
- print "%if %{?rhel}%{!?rhel:0} >= 5\n";
- print "BuildRequires:\tgraphviz\n";
- print "BuildRequires:\tghostscript\n";
- print "%if \"%{?rhel}\" == \"5\"\n";
- print "BuildRequires:\tgraphviz-gd\n";
- print "%endif\n";
- print "%endif\n";
+ print "BuildRequires:\tgraphviz\n";
+ print "BuildRequires:\tghostscript\n";
+ print "%if \"%{?rhel}\" == \"5\"\n";
+ print "BuildRequires:\tgraphviz-gd\n";
print "%endif\n";
print "%if %{?fedora}%{!?fedora:0} >= 9\n";
print "BuildRequires:\ttex(latex)\n";
@@ -563,6 +556,10 @@ EOF
### INSERT RELEVANT PARTS OF $postinstall HERE ###
" if defined $setupfile;
+print "
+GLOBUSPACKAGEDIR=\$RPM_BUILD_ROOT%{_datadir}/globus/packages
+";
+
if (not defined $pkglibs) {
print "
# This library is opened using lt_dlopenext, so the libtool archives
@@ -576,16 +573,14 @@ else {
print "
# Remove libtool archives (.la files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \\;
-sed '/lib.*\\.la\$/d' \\
- -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\\.la\$/d' -i \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
" if ($libs);
}
print "
# Remove static libraries (.a files)
find \$RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \\;
-sed '/lib.*\\.a\$/d' \\
- -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist
+sed '/lib.*\\.a\$/d' -i \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
" if ($libs);
print "
@@ -600,14 +595,12 @@ print "
mv \$RPM_BUILD_ROOT%{_docdir}/%{_name} \\
\$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \\
- -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+ -i \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-# Remove unwanted documentation
-rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
+# Remove unwanted documentation (needed for RHEL4)
rm -f \$RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
-sed -e '/deprecated\\.3/d' \\
- -e '/_%{_name}-%{version}_.*\\.3/d' \\
- -i \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist
+sed -e '/_%{_name}-%{version}_.*\\.3/d' \\
+ -i \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
" if ($docpkg);
print"
@@ -619,28 +612,30 @@ install -m 644 -p GLOBUS_LICENSE \$RPM_B
";
if (!$libs) {
- print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
- print " \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
+ print "cat \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \\\n";
+ print " \$GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist \\\n"
+ if defined $setupfile;
print " | sed s!^!%{_prefix}! > package.filelist\n";
}
else {
- print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \\\n";
+ print "cat \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \\\n";
print " | sed s!^!%{_prefix}! > package.filelist\n";
}
if ($progspkg) {
- print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_pgm.filelist \\\n";
- print " \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}_setup/noflavor_pgm.filelist \\\n" if defined $setupfile;
+ print "cat \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \\\n";
+ print " \$GLOBUSPACKAGEDIR/%{_name}_setup/noflavor_pgm.filelist \\\n"
+ if defined $setupfile;
print " | sed s!^!%{_prefix}! > package-progs.filelist\n";
}
if ($develpkg) {
- print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \\\n";
+ print "cat \$GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \\\n";
print " | sed s!^!%{_prefix}! > package-devel.filelist\n";
}
if ($docpkg) {
- print "cat \$RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \\\n";
+ print "cat \$GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \\\n";
print " | sed -e 's!/man/.*!&\*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist\n";
}
@@ -687,7 +682,7 @@ print "
print "
%changelog
-* " . strftime('%a %b %e %Y', localtime) . " $fullname <$email> - $version-$release
+* " . strftime('%a %b %d %Y', localtime) . " $fullname <$email> - $version-$release
- Autogenerated
"
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-core/EL-5/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 27 Apr 2009 16:54:44 -0000 1.4
+++ import.log 15 Jun 2009 15:13:00 -0000 1.5
@@ -2,3 +2,4 @@ globus-core-5_15-1_fc9:EL-5:globus-core-
globus-core-5_15-2_fc9:EL-5:globus-core-5.15-2.fc9.src.rpm:1240003791
globus-core-5_15-3_fc9:EL-5:globus-core-5.15-3.fc9.src.rpm:1240326177
globus-core-5_15-4_fc9:EL-5:globus-core-5.15-4.fc9.src.rpm:1240851250
+globus-core-5_15-5_fc9:EL-5:globus-core-5.15-5.fc9.src.rpm:1245078754
- Previous message (by thread): rpms/globus-core/EL-4 globus-core-ar-ranlib.patch, NONE, 1.1 globus-core-mingw.patch, NONE, 1.1 globus-core-platforms.patch, NONE, 1.1 globus-core-compat.patch, 1.1, 1.2 globus-core.spec, 1.4, 1.5 globus-spec-creator, 1.1, 1.2 import.log, 1.4, 1.5
- Next message (by thread): rpms/jhead/EL-5 .cvsignore, 1.9, 1.10 jhead.spec, 1.18, 1.19 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list