From 415e14f0b788ffcb8f6bdd881f1b4ce3775e8f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Mon, 19 Oct 2009 16:12:30 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for xmltooling --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 6624dcb28a838638f225da701e33d01f38ce8ff8 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 19 Oct 2009 18:09:27 +0000 Subject: [PATCH 2/4] First branches to existing OS. --- sources | 1 + xmltooling-python-cxxtest.patch | 18 +++++ xmltooling.spec | 137 ++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 xmltooling-python-cxxtest.patch create mode 100644 xmltooling.spec diff --git a/sources b/sources index e69de29..6b91ef8 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2331cbcf257319c40854cefd1783fa96 xmltooling-1.2.2.tar.gz diff --git a/xmltooling-python-cxxtest.patch b/xmltooling-python-cxxtest.patch new file mode 100644 index 0000000..932e646 --- /dev/null +++ b/xmltooling-python-cxxtest.patch @@ -0,0 +1,18 @@ +diff -uNr xmltooling-1.2.2.ORIG/configure.ac xmltooling-1.2.2/configure.ac +--- xmltooling-1.2.2.ORIG/configure.ac 2009-10-05 19:13:14.066951091 +0200 ++++ xmltooling-1.2.2/configure.ac 2009-10-05 19:13:54.945200753 +0200 +@@ -346,12 +346,12 @@ + ) + + # Check for unit test support +-CXXTEST="/usr/bin/cxxtestgen.pl" ++CXXTEST="/usr/bin/cxxtestgen" + CXXTESTFLAGS="" + AC_ARG_WITH(cxxtest, + AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]), + [if test x_$with_cxxtest != x_/usr; then +- CXXTEST="${with_cxxtest}/cxxtestgen.pl" ++ CXXTEST="${with_cxxtest}/cxxtestgen" + CXXTESTFLAGS="-I${with_cxxtest}" + fi]) + if ! test -f "${CXXTEST}"; then diff --git a/xmltooling.spec b/xmltooling.spec new file mode 100644 index 0000000..ea4d636 --- /dev/null +++ b/xmltooling.spec @@ -0,0 +1,137 @@ +Name: xmltooling +Version: 1.2.2 +Release: 3%{?dist} +Summary: XML signing and encrytion library + +Group: System Environment/Libraries +License: ASL 2.0 +URL: https://spaces.internet2.edu/display/OpenSAML/XMLTooling-C +Source0: http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2.1/xmltooling-%{version}.tar.gz +Patch0: %{name}-python-cxxtest.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: xml-security-c-devel +#cxxtest is not available in EPEL4. +# so skip it. +%if "%{?rhel}" != "4" +BuildRequires: cxxtest +%endif +BuildRequires: log4cpp-devel +BuildRequires: xerces-c-devel +BuildRequires: doxygen + +%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libcurl-devel +%else +BuildRequires: curl-devel +%endif + +# To bring in /usr/share/xml +Requires: xml-common + +# Needed since we are doing and autoreconf +# below. +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool + + +%description +The XMLTooling library contains generic XML parsing and processing +classes based on the Xerces-C DOM. It adds more powerful facilities +for declaring element- and type-specific API and implementation +classes to add value around the DOM, as well as signing and encryption +support. + +%package doc +Group: Documentation +Summary: XML signing and encrytion library documentation +%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 +BuildArch: noarch +%endif + +%description doc +The XMLTooling library contains generic XML parsing and processing +classes based on the Xerces-C DOM. It adds more powerful facilities +for declaring element- and type-specific API and implementation +classes to add value around the DOM, as well as signing and encryption +support. + +This %{name}-doc package contains documentation. + +%package devel +Group: System Environment/Libraries +Summary: XML signing and encrytion library development files +Requires: %{name} = %{version}-%{release} + +%description devel +The XMLTooling library contains generic XML parsing and processing +classes based on the Xerces-C DOM. It adds more powerful facilities +for declaring element- and type-specific API and implementation +classes to add value around the DOM, as well as signing and encryption +support. + +This %{name}-devel package contains header files. + + +%prep +%setup -q +%patch0 -p1 + + +%build +aclocal +autoconf +autoheader +automake --add-missing --copy +libtoolize --copy --force + +%if "%{?rhel}" == "4" +%configure --without-cxxtest +%else +%configure +%endif +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +# Don't need the unit test executer. +rm -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest + +%check +make check + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_libdir}/*.so.* +%{_datadir}/xml/xmltooling +%doc doc/README.txt doc/LICENSE.txt + +%files doc +%defattr(-,root,root,-) +%doc doc/api/html + +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name} +%{_libdir}/*.so + +%changelog +* Mon Oct 19 2009 Steve Traylen 1.2.2-3 +- Disable cxxtests for EPEL4 only. +* Sat Oct 17 2009 Steve Traylen 1.2.2-2 +- Change Source URL to be permanent rather than contain "latest" +- Require xml-common to bring in /usr/share/xml +* Mon Oct 5 2009 Steve Traylen 1.2.2-1 +- First Build + From 0afd2d969679660e7c324d78eda3cae325ca648f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:33 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 35c343f..fdc879b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xmltooling SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3ccb5cfe7c90a90c89f8412da3cd61eac63da8d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:58:13 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fdc879b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmltooling -# $Id$ -NAME := xmltooling -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12