diff --git a/globus-gsi-openssl-error-doxygen.patch b/globus-gsi-openssl-error-doxygen.patch new file mode 100644 index 0000000..991d612 --- /dev/null +++ b/globus-gsi-openssl-error-doxygen.patch @@ -0,0 +1,97 @@ +diff --git a/library/Doxyfile.in b/library/Doxyfile.in +index 6ea6a64..33d00ee 100644 +--- a/library/Doxyfile.in ++++ b/library/Doxyfile.in +@@ -13,3 +13,4 @@ GENERATE_DEPRECATEDLIST= NO + QUIET = YES + INPUT = @srcdir@ + EXCLUDE_PATTERNS = version.h ++PREDEFINED = GLOBUS_DONT_DOCUMENT_INTERNAL DOXYGEN +diff --git a/library/Makefile.am b/library/Makefile.am +index aa9c3b9..ac00c4a 100644 +--- a/library/Makefile.am ++++ b/library/Makefile.am +@@ -30,7 +30,7 @@ all-local: $(DOC_STAMPS) + install-data-local: $(DOC_STAMPS) + if test -d doc/man/man3; then \ + install -d -m 755 $(DESTDIR)$(mandir)/man3; \ +- $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \ ++ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ + fi + if test -d doc/html; then \ + for dir in `(cd doc; find html -type d)`; do \ +diff --git a/library/Makefile.in b/library/Makefile.in +index aa9c3b9..ac00c4a 100644 +--- a/library/Makefile.in ++++ b/library/Makefile.in +@@ -30,7 +30,7 @@ all-local: $(DOC_STAMPS) + install-data-local: $(DOC_STAMPS) + if test -d doc/man/man3; then \ + install -d -m 755 $(DESTDIR)$(mandir)/man3; \ +- $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \ ++ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ + fi + if test -d doc/html; then \ + for dir in `(cd doc; find html -type d)`; do \ +diff --git a/library/globus_error_openssl.c b/library/globus_error_openssl.c +index 140c257..c343794 100644 +--- a/library/globus_error_openssl.c ++++ b/library/globus_error_openssl.c +@@ -17,12 +17,8 @@ + #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL + /** + * @file globus_error_openssl.c ++ * @brief Globus Generic Error + * @author Sam Lang +- * +- * $RCSfile$ +- * $Revision$ +- * $Date$ +- * + */ + #endif + +diff --git a/library/globus_error_openssl.h b/library/globus_error_openssl.h +index 133dade..5b96124 100644 +--- a/library/globus_error_openssl.h ++++ b/library/globus_error_openssl.h +@@ -19,6 +19,7 @@ + + /** + * @file globus_error_openssl.h ++ * @brief Globus Generic Error + */ + #ifndef GLOBUS_GLOBAL_DOCUMENT_SET + /** +diff --git a/library/globus_i_error_openssl.c b/library/globus_i_error_openssl.c +index c1593cf..c9ed50f 100644 +--- a/library/globus_i_error_openssl.c ++++ b/library/globus_i_error_openssl.c +@@ -17,12 +17,7 @@ + #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL + /** + * @file globus_i_error_openssl.c +- * Globus Generic Error +- * +- * $RCSfile$ +- * $Revision$ +- * $Date$ +- * ++ * @brief Globus Generic Error + * @author Sam Lang + */ + +diff --git a/library/globus_i_error_openssl.h b/library/globus_i_error_openssl.h +index 62a9654..36034e8 100644 +--- a/library/globus_i_error_openssl.h ++++ b/library/globus_i_error_openssl.h +@@ -20,8 +20,7 @@ + #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL + /** + * @file globus_i_error_openssl.h +- * Globus Generic Error +- * ++ * @brief Globus Generic Error + * @author Sam Lang + */ + diff --git a/globus-gsi-openssl-error.spec b/globus-gsi-openssl-error.spec index de9ffb7..b014d83 100644 --- a/globus-gsi-openssl-error.spec +++ b/globus-gsi-openssl-error.spec @@ -1,57 +1,32 @@ -%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64 -%global flavor gcc64 -%else -%global flavor gcc32 -%endif - %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: globus-gsi-openssl-error %global _name %(tr - _ <<< %{name}) -Version: 2.1 -Release: 13%{?dist} +Version: 3.4 +Release: 1%{?dist} Summary: Globus Toolkit - Globus OpenSSL Error Handling Group: System Environment/Libraries License: ASL 2.0 URL: http://www.globus.org/ -Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz +Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz # README file Source8: GLOBUS-GSIC +# Doxygen fixes +Patch0: %{name}-doxygen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: globus-common%{?_isa} >= 14 -BuildRequires: grid-packaging-tools >= 3.4 -BuildRequires: globus-core >= 8 -BuildRequires: globus-common-devel >= 14 +BuildRequires: globus-common-devel >= 15 BuildRequires: openssl-devel BuildRequires: doxygen -BuildRequires: graphviz -%if "%{?rhel}" == "5" -BuildRequires: graphviz-gd -%endif -BuildRequires: ghostscript -BuildRequires: tex(latex) -%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7 -BuildRequires: tex(fullpage.sty) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(sectsty.sty) -BuildRequires: tex(tocloft.sty) -BuildRequires: tex(xtab.sty) -BuildRequires: tex-ec -BuildRequires: tex-courier -BuildRequires: tex-helvetic -BuildRequires: tex-times -BuildRequires: tex-symbol -BuildRequires: tex-rsfs -%endif +# Additional requirements for make check +BuildRequires: perl(Test::More) %package devel Summary: Globus Toolkit - Globus OpenSSL Error Handling Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: globus-common-devel%{?_isa} >= 14 -Requires: globus-core%{?_isa} >= 8 +Requires: globus-common-devel%{?_isa} >= 15 Requires: openssl-devel%{?_isa} %package doc @@ -60,7 +35,6 @@ Group: Documentation %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 BuildArch: noarch %endif -Requires: %{name} = %{version}-%{release} %description The Globus Toolkit is an open source software toolkit used for building Grid @@ -91,21 +65,16 @@ Globus OpenSSL Error Handling Documentation Files %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build -# 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 - -unset GLOBUS_LOCATION -unset GPT_LOCATION -%{_datadir}/globus/globus-bootstrap.sh +# Reduce overlinking +export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}" -%configure --disable-static --with-flavor=%{flavor} \ - --enable-doxygen --with-docdir=%{_pkgdocdir} +%configure --disable-static \ + --includedir='${prefix}/include/globus' \ + --libexecdir='${datadir}/globus' \ + --docdir=%{_pkgdocdir} # Reduce overlinking sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool @@ -116,31 +85,14 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} -GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages - # Remove libtool archives (.la files) -find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \; -sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist - -# Move license file to main package -grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ - >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist -sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist - -# Remove directory man page -rm -f %{buildroot}%{_mandir}/man3/*%{_name}-%{version}* -sed /%{_name}-%{version}/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist +rm %{buildroot}%{_libdir}/*.la # Install README file install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README -# Generate package filelists -cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \ - | sed s!^!%{_prefix}! > package.filelist -cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \ - | sed s!^!%{_prefix}! > package-devel.filelist -cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \ - | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist +%check +make check %clean rm -rf %{buildroot} @@ -149,17 +101,30 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%files -f package.filelist -%dir %{_datadir}/globus/packages/%{_name} +%files +%{_libdir}/libglobus_openssl_error.so.* %dir %{_pkgdocdir} +%doc %{_pkgdocdir}/GLOBUS_LICENSE %doc %{_pkgdocdir}/README -%files -f package-devel.filelist devel +%files devel +%{_includedir}/globus/* +%{_libdir}/libglobus_openssl_error.so +%{_libdir}/pkgconfig/%{name}.pc -%files -f package-doc.filelist doc +%files doc +%doc %{_mandir}/man3/* +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/GLOBUS_LICENSE %dir %{_pkgdocdir}/html +%doc %{_pkgdocdir}/html/* %changelog +* Fri Sep 12 2014 Mattias Ellert - 3.4-1 +- Update to Globus Toolkit 6.0 +- Drop GPT build system and GPT packaging metadata +- Enable checks + * Sat Aug 16 2014 Fedora Release Engineering - 2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index f24bd17..47a70cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c25bfe178ae0c8fcbc1aa264b655df2e globus_gsi_openssl_error-2.1.tar.gz +a6bb90698a70238bae34ba1455b107fd globus_gsi_openssl_error-3.4.tar.gz