Makefile and specfile changes for SuSE.

diff --git a/Makefile.am b/Makefile.am
index 49750bb..6b98367 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,23 +13,15 @@ dist-hook:
 
 SUBDIRS = doc schemas saml samltest samlsign
 
+GENFILES = opensaml.spec pkginfo Portfile
+
 if DX_COND_doc
-all-local: opensaml.spec pkginfo doxygen-doc
+all-local: doxygen-doc $(GENFILES)
 else
-all-local: opensaml.spec pkginfo
+all-local: $(GENFILES)
 endif
 
-install-data-hook:
-       rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
-       cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
-
-opensaml.spec: opensaml.spec.in Makefile
-       rm -f $@.tmp
-       sed < $@.in > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
-
-pkginfo: pkginfo.in Makefile
+$(GENFILES): %: %.in Makefile
        rm -f $@.tmp
        sed < $@.in > $@.tmp \
            -e 's:@-VERSION-@:${VERSION}:'
@@ -42,11 +34,9 @@ EXTRA_DIST = $(DX_CONFIG) \
        acx_pthread.m4 \
        depcomp \
        config_win32.h \
-       opensaml.spec.in \
-       opensaml.spec \
-       pkginfo.in \
-       pkginfo \
+       $(GENFILES) \
+       $(GENFILES:%=%.in) \
        depend \
        postinstall
 
-DISTCLEANFILES = opensaml.spec pkginfo
+DISTCLEANFILES = $(GENFILES)

diff --git a/Portfile b/Portfile.in
similarity index 61%
rename from Portfile
rename to Portfile.in
index 04b94dc..ae3aa87 100644 (file)
--- a/Portfile
+++ b/Portfile.in
@@ -1,14 +1,14 @@
 PortSystem 1.0
 
 name               opensaml
-version            2.2.1
+version            @-VERSION-@
 categories         shibboleth
 maintainers        cantor.2@osu.edu
 description        OpenSAML 2 library for C++
 long_description   SAML 2.0/1.x toolkit
 homepage           http://www.opensaml.org/
 master_sites       http://shibboleth.internet2.edu/downloads/opensaml/cpp/${version}/
-checksums          sha1 37d190a7cd88d151ca7ffd43cc914ad47425b114
+checksums          sha1 @CHECKSUM@
 
 depends_lib        port:xmltooling \
                    port:xml-security-c \
@@ -20,16 +20,3 @@ configure.args     --disable-static \
                    --with-xmltooling=${prefix} \
                    --with-xerces=${prefix} \
                    --with-xmlsec=${prefix}
-
-platform darwin 8 {
-       configure.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       build.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       destroot.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-}
-
-platform darwin 9 {
-       configure.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       build.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-       destroot.env-append MACOSX_DEPLOYMENT_TARGET=10.4
-}
-

diff --git a/doc/Makefile.am b/doc/Makefile.am
index db6bd81..2c53926 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,13 @@
 AUTOMAKE_OPTIONS = foreign
 
-pkgdocdir = $(datadir)/doc/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
+
+install-data-hook:
+       cp -r api $(DESTDIR)$(pkgdocdir)
+       rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
 
 docfiles = \
-    README.txt \
+       README.txt \
        LICENSE.txt \
        NOTICE.txt \
        LOG4CPP.LICENSE
@@ -11,4 +15,3 @@ docfiles = \
 pkgdoc_DATA = $(docfiles)
 
 EXTRA_DIST = $(docfiles) api
-       
\ No newline at end of file

diff --git a/opensaml.spec.in b/opensaml.spec.in
index aad9ff0..d590e8f 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,7 +1,7 @@
 Name:          opensaml
-Summary:       Open source SAML library
 Version:       @-VERSION-@
 Release:       1
+Summary:    OpenSAML SAML library
 Group:         System Environment/Libraries
 Vendor:                Internet2
 License:       Apache 2.0
@@ -10,42 +10,79 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %if 0%{?suse_version} > 1030
 BuildRequires:  libXerces-c-devel >= 2.8.0
+BuildRequires:  libxml-security-c-devel >= 1.4.0
+BuildRequires:  libxmltooling-devel >= 1.2
+%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
+%{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
 %else
 BuildRequires:  xerces%{?xercesver}-c-devel >= 2.8.0
-%endif
 BuildRequires:  xml-security-c-devel >= 1.4.0
-BuildRequires: xmltooling-devel >= 1.2
+BuildRequires:  xmltooling-devel >= 1.2
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
+%endif
+BuildRequires:  gcc-c++
+%{!?_without_doxygen:BuildRequires: doxygen}
+
+%if "%{_vendor}" == "suse"
+%define pkgdocdir %{_docdir}/%{name}
+%else
+%define pkgdocdir %{_docdir}/%{name}-%{version}
+%endif
 
 %description
 OpenSAML is an open source implementation of the OASIS Security Assertion
 Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
 
-This package contains the saml runtime library.
+%if 0%{?suse_version} > 1030
+%package -n libsaml22
+Summary:    OpenSAML SAML library
+Group:      Development/Libraries
+Provides:   opensaml = %{version}
+
+%description -n libsaml22
+OpenSAML is an open source implementation of the OASIS Security Assertion
+Markup Language Specification. It contains a set of open source C++ classes
+that support the SAML 1.0, 1.1, and 2.0 specifications.
 
+This package contains just the shared library.
+%endif
+
+%if 0%{?suse_version} > 1030
+%package -n libsaml-devel
+Requires: libsaml22 = %version
+%else
 %package devel
+Requires: %name = %version
+%endif
 Summary: OpenSAML development Headers
 Group: Development/Libraries
-Requires: %{name} = %{version}
+%if 0%{?suse_version} > 1030
+Requires: libXerces-c-devel >= 2.8.0
+Requires: libxml-security-c-devel >= 1.4.0
+Requires: libxmltooling-devel >= 1.2
+%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
+%{!?_with_log4cpp:Requires: liblog4shib-devel}
+%else
+Requires: xerces%{?xercesver}-c-devel >= 2.8.0
+Requires: xml-security-c-devel >= 1.4.0
 Requires: xmltooling-devel >= 1.2
+%{?_with_log4cpp:Requires: log4cpp-devel >= 1.0}
+%{!?_with_log4cpp:Requires: log4shib-devel}
+%endif
 
+%if 0%{?suse_version} > 1030
+%description -n libsaml-devel
+%else
 %description devel
+%endif
 OpenSAML is an open source implementation of the OASIS Security Assertion
 Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
 
-This package contains the headers and other necessary files to build
-applications or libraries that use or extend the saml library.
+This package includes files needed for development with opensaml.
 
-%package docs
-Summary: OpenSAML API Documentation
-Group: Development/Libraries
-Requires: %{name} = %{version}
-
-%description docs
-OpenSAML Library API documentation generated by doxygen.
 
 %prep
 %setup -q
@@ -55,10 +92,9 @@ OpenSAML Library API documentation generated by doxygen.
 %{__make}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT/%{_bindir} -type f |
-  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
+%{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
+# Don't package unit tester if present.
+%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/samltest
 
 %check
 %{__make} check
@@ -66,35 +102,48 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%ifnos solaris2.8 solaris2.9 solaris2.10 
+%ifnos solaris2.8 solaris2.9 solaris2.10
+%if 0%{?suse_version} > 1030
+%post -n libsaml22 -p /sbin/ldconfig
+%else
 %post -p /sbin/ldconfig
 %endif
+%endif
 
-%ifnos solaris2.8 solaris2.9 solaris2.10 
+%ifnos solaris2.8 solaris2.9 solaris2.10
+%if 0%{?suse_version} > 1030
+%postun -n libsaml22 -p /sbin/ldconfig
+%else
 %postun -p /sbin/ldconfig
 %endif
+%endif
 
-%files -f rpm.binlist
+%files
+%defattr(-,root,root,-)
+%{_bindir}/samlsign
+%if 0%{?suse_version} > 1030
+%files -n libsaml22
 %defattr(-,root,root,-)
+%endif
 %{_libdir}/libsaml.so.*
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
-%docdir %{_datadir}/doc/%{name}
-%{_datadir}/doc/%{name}/README.txt
-%{_datadir}/doc/%{name}/LICENSE.txt
-%{_datadir}/doc/%{name}/NOTICE.txt
-%{_datadir}/doc/%{name}/LOG4CPP.LICENSE
 
+%if 0%{?suse_version} > 1030
+%files -n libsaml-devel
+%else
 %files devel
+%endif
 %defattr(-,root,root,-)
-%{_includedir}
-%{_libdir}/libsaml.so
-
-%files docs
-%defattr(644,root,root,755)
-%doc %{_datadir}/doc/%{name}/api
+%{_includedir}/*
+%{_libdir}/*.so
+%doc %{pkgdocdir}
 
 %changelog
+* Sat Aug 8 2009  Scott Cantor  <cantor.2@osu.edu>  - 2.2.1-1
+- SuSE conventions
+- Stop packaging unit tester
+
 * Wed Dec 3 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.2-1
 - Bumping for minor update.
 - Fixing SUSE Xerces dependency name.