rpms/globus-gssapi-error/devel globus-gssapi-error-namespace.patch, NONE, 1.1 globus-gssapi-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Fri May 22 04:30:06 UTC 2009
- Previous message: rpms/ghc/devel ghc.spec, 1.90, 1.91 ghc-mk-pkg-install-inplace.patch, 1.1, NONE
- Next message: rpms/globus-gssapi-error/F-9 globus-gssapi-error-namespace.patch, NONE, 1.1 globus-gssapi-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-gssapi-error/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11786/devel
Modified Files:
.cvsignore sources
Added Files:
globus-gssapi-error-namespace.patch globus-gssapi-error.spec
import.log
Log Message:
* Wed Apr 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-2
- Fix package and library namespace
globus-gssapi-error-namespace.patch:
--- NEW FILE globus-gssapi-error-namespace.patch ---
diff -ur globus_gssapi_error-2.5.orig/library/Makefile.am globus_gssapi_error-2.5/library/Makefile.am
--- globus_gssapi_error-2.5.orig/library/Makefile.am 2003-04-01 20:57:01.000000000 +0200
+++ globus_gssapi_error-2.5/library/Makefile.am 2009-04-29 03:24:48.000000000 +0200
@@ -9,14 +9,14 @@
flavorinclude_HEADERS = \
globus_error_gssapi.h
-lib_LTLIBRARIES = libgssapi_error_$(GLOBUS_FLAVOR_NAME).la
+lib_LTLIBRARIES = libglobus_gssapi_error_$(GLOBUS_FLAVOR_NAME).la
INCLUDES = @GPT_INCLUDES@
-libgssapi_error___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
+libglobus_gssapi_error___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
-libgssapi_error___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
+libglobus_gssapi_error___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
-libgssapi_error___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
+libglobus_gssapi_error___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
include $(top_srcdir)/globus_automake_post
diff -ur globus_gssapi_error-2.5.orig/pkgdata/pkg_data_src.gpt.in globus_gssapi_error-2.5/pkgdata/pkg_data_src.gpt.in
--- globus_gssapi_error-2.5.orig/pkgdata/pkg_data_src.gpt.in 2004-08-25 03:54:04.000000000 +0200
+++ globus_gssapi_error-2.5/pkgdata/pkg_data_src.gpt.in 2009-04-29 03:23:39.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE gpt_package_metadata SYSTEM "globus_package.dtd">
-<gpt_package_metadata Name="gssapi_error" Format_Version="0.01">
+<gpt_package_metadata Name="globus_gssapi_error" Format_Version="0.01">
<Aging_Version Major="2" Minor="5" Age="0"/>
<Description> GSSAPI Error Library</Description>
@@ -47,7 +47,7 @@
<cflags>@GPT_PKG_CFLAGS@</cflags>
<external_includes>@GPT_EXTERNAL_INCLUDES@</external_includes>
<external_libs>@GPT_EXTERNAL_LIBS@</external_libs>
- <pkg_libs>-lgssapi_error</pkg_libs>
+ <pkg_libs>-lglobus_gssapi_error</pkg_libs>
</Build_Environment>
</src_pkg>
--- NEW FILE globus-gssapi-error.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif
Name: globus-gssapi-error
%global _name %(tr - _ <<< %{name})
Version: 2.5
Release: 2%{?dist}
Summary: Globus Toolkit - GSSAPI Error Library
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
# Source is extracted from the globus toolkit installer:
# wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
# tar -jxf gt4.2.1-all-source-installer.tar.bz2
# mv gt4.2.1-all-source-installer/source-trees/gsi/gssapi_error/source globus_gssapi_error-2.5
# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gssapi_error-2.5
# tar -zcf globus_gssapi_error-2.5.tar.gz globus_gssapi_error-2.5
Source: %{_name}-%{version}.tar.gz
# This is a workaround for the broken epstopdf script in RHEL5
# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
Source9: epstopdf-2.9.5gw
# Fix package and library namespace:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6724
Patch0: %{name}-namespace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common
BuildRequires: grid-packaging-tools
BuildRequires: globus-common-devel >= 3
BuildRequires: globus-gss-assist-devel >= 3
BuildRequires: globus-core >= 4
BuildRequires: doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires: graphviz
BuildRequires: ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires: graphviz
BuildRequires: ghostscript
%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires: tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
%endif
%endif
%package devel
Summary: Globus Toolkit - GSSAPI Error Library Development Files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: globus-common-devel >= 3
Requires: globus-gss-assist-devel >= 3
Requires: globus-core >= 4
%package doc
Summary: Globus Toolkit - GSSAPI Error Library Documentation Files
Group: Documentation
Requires: %{name} = %{version}-%{release}
%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name} package contains:
GSSAPI Error Library
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name}-devel package contains:
GSSAPI Error Library Development Files
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name}-doc package contains:
GSSAPI Error Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif
%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache
# Remove flavor tags
for f in `find . -name Makefile.am` ; do
sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
-e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
-e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
-i pkgdata/pkg_data_src.gpt.in
%{_datadir}/globus/globus-bootstrap.sh
%configure --with-flavor=%{flavor} --enable-doxygen
make %{?_smp_mflags}
%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# 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
# 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
# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
# Move documentation to default RPM location
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
# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
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
# 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}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
| sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc
%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html
%changelog
* Wed Apr 29 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-2
- Fix package and library namespace
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball
* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-0.5
- Adapting to updated globus-core package
* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-0.4
- Add s390x to the list of 64 bit platforms
* Thu Jan 1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-0.3
- Adapt to updated GPT package
* Mon Oct 20 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-0.2
- Update to Globus Toolkit 4.2.1
* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.5-0.1
- Autogenerated
--- NEW FILE import.log ---
globus-gssapi-error-2_5-2_fc9:HEAD:globus-gssapi-error-2.5-2.fc9.src.rpm:1242966545
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-error/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 21 May 2009 23:31:34 -0000 1.1
+++ .cvsignore 22 May 2009 04:29:36 -0000 1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gssapi_error-2.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-error/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 21 May 2009 23:31:34 -0000 1.1
+++ sources 22 May 2009 04:29:36 -0000 1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
+0d63d8f45c8acf2097641bbba64ecc12 globus_gssapi_error-2.5.tar.gz
- Previous message: rpms/ghc/devel ghc.spec, 1.90, 1.91 ghc-mk-pkg-install-inplace.patch, 1.1, NONE
- Next message: rpms/globus-gssapi-error/F-9 globus-gssapi-error-namespace.patch, NONE, 1.1 globus-gssapi-error.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list