rpms/globus-gsi-sysconfig/F-11 globus-gsi-sysconfig-mingw.patch, NONE, 1.1 globus-gsi-sysconfig.spec, 1.1, 1.2 import.log, 1.1, 1.2
Mattias Ellert
ellert at fedoraproject.org
Mon Jun 15 16:48:48 UTC 2009
Author: ellert
Update of /cvs/pkgs/rpms/globus-gsi-sysconfig/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17415/F-11
Modified Files:
globus-gsi-sysconfig.spec import.log
Added Files:
globus-gsi-sysconfig-mingw.patch
Log Message:
* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-2
- Update to official Fedora Globus packaging guidelines
globus-gsi-sysconfig-mingw.patch:
--- NEW FILE globus-gsi-sysconfig-mingw.patch ---
diff -ur globus_gsi_sysconfig-2.2.orig/library/globus_gsi_system_config.c globus_gsi_sysconfig-2.2/library/globus_gsi_system_config.c
--- globus_gsi_sysconfig-2.2.orig/library/globus_gsi_system_config.c 2008-09-15 18:36:55.000000000 +0200
+++ globus_gsi_sysconfig-2.2/library/globus_gsi_system_config.c 2009-05-06 16:51:12.000000000 +0200
@@ -91,7 +91,6 @@
#endif
#ifdef WIN32
-#include "winglue.h"
#include <io.h>
#else
#ifdef HAVE_UNISTD_H
Index: globus-gsi-sysconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-11/globus-gsi-sysconfig.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-gsi-sysconfig.spec 30 Apr 2009 07:19:32 -0000 1.1
+++ globus-gsi-sysconfig.spec 15 Jun 2009 16:48:17 -0000 1.2
@@ -7,7 +7,7 @@
Name: globus-gsi-sysconfig
%global _name %(tr - _ <<< %{name})
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus GSI System Config Library
Group: System Environment/Libraries
@@ -23,6 +23,9 @@ 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
+# Fixes for mingw compilation:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6742
+Patch0: %{name}-mingw.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-openssl >= 1
@@ -33,18 +36,11 @@ BuildRequires: globus-gsi-openssl-error-
BuildRequires: globus-openssl-devel >= 1
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
@@ -99,6 +95,7 @@ Globus GSI System Config Library Documen
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -140,15 +137,15 @@ export PATH=$PWD/bin:$PATH
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+
# 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
# 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
# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
@@ -159,25 +156,23 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgco
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
# 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 \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
| sed s!^!%{_prefix}! > package.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
| sed s!^!%{_prefix}! > package-devel.filelist
-cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
+cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
| sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
%clean
@@ -202,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Wed Jun 03 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-2
+- Update to official Fedora Globus packaging guidelines
+
* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-1
- Make comment about source retrieval more explicit
- Change defines to globals
@@ -214,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.4
- Add s390x to the list of 64 bit platforms
-* Thu Jan 1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
+* Thu Jan 01 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.3
- Adapt to updated GPT package
* Tue Oct 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.2-0.2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-sysconfig/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 30 Apr 2009 07:19:33 -0000 1.1
+++ import.log 15 Jun 2009 16:48:17 -0000 1.2
@@ -1 +1,2 @@
globus-gsi-sysconfig-2_2-1_fc9:F-11:globus-gsi-sysconfig-2.2-1.fc9.src.rpm:1241075946
+globus-gsi-sysconfig-2_2-2_fc9:F-11:globus-gsi-sysconfig-2.2-2.fc9.src.rpm:1245084477
More information about the fedora-extras-commits
mailing list