From 7180d28ca0b8f5f0e1a562574cebe9b7f380ea07 Mon Sep 17 00:00:00 2001 From: Mihkel Vain Date: Apr 30 2014 09:06:22 +0000 Subject: Update to 3.8 release --- diff --git a/.gitignore b/.gitignore index f7b0941..37a0007 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libdigidocpp-0.3.0.tar.bz2 +/libdigidocpp-3.8.0.1208.tar.gz diff --git a/libdigidocpp-0.3.0-gcc47.patch b/libdigidocpp-0.3.0-gcc47.patch deleted file mode 100644 index 9bbcae3..0000000 --- a/libdigidocpp-0.3.0-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libdigidocpp-0.3.0.orig/src/XmlConf.cpp libdigidocpp-0.3.0/src/XmlConf.cpp ---- libdigidocpp-0.3.0.orig/src/XmlConf.cpp 2010-03-25 13:09:55.000000000 +0100 -+++ libdigidocpp-0.3.0/src/XmlConf.cpp 2012-01-19 05:49:52.744886310 +0100 -@@ -27,6 +27,8 @@ - #include - #include - -+#include -+ - #ifdef _WIN32 - #include - #include diff --git a/libdigidocpp.spec b/libdigidocpp.spec index 0e5fbdf..03a81e2 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,49 +1,19 @@ -%global build_perl_module 1 -%global build_php_module 1 -%global build_python_module 1 - -%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) -%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}} - -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - Name: libdigidocpp -Version: 0.3.0 -Release: 20%{?dist} +Version: 3.8.0.1208 +Release: 1%{?dist} Summary: Library for creating and validating BDoc and DDoc containers - -Group: System Environment/Libraries License: LGPLv2+ -URL: http://code.google.com/p/esteid/ -Source0: http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2 -Patch0: libdigidocpp-0.3.0-gcc47.patch +URL: http://www.ria.ee +Source0: https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz + BuildRequires: cmake BuildRequires: libdigidoc-devel -BuildRequires: libp11-devel -BuildRequires: minizip-devel BuildRequires: openssl-devel BuildRequires: xml-security-c-devel BuildRequires: xsd -# Handle bindings -%if 0%{?build_perl_module}%{?build_php_module}%{?build_python_module} -BuildRequires: swig -%endif -%if 0%{?build_perl_module} -BuildRequires: perl-devel -%endif -%if 0%{?build_php_module} -BuildRequires: php-devel -%endif -%if 0%{?build_python_module} -BuildRequires: python2-devel -%endif - # Dynamically loaded libraries -Requires: libdigidoc%{?_isa} Requires: opensc%{?_isa} %description @@ -54,10 +24,8 @@ used for storing legally binding digital signatures. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libdigidoc-devel -Requires: libp11-devel Requires: openssl-devel Requires: xml-security-c-devel Requires: xsd @@ -66,136 +34,55 @@ Requires: xsd The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - -%if 0%{?build_perl_module} -%package -n perl-digidoc -Summary: Perl bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Obsoletes: %{name}-perl < 0.3.0-1 -Provides: %{name}-perl = %{version}-%{release} - -%{?perl_default_filter} - -%description -n perl-digidoc -The perl-digidoc package contains Perl bindings for the %{name} library. -%endif - - -%if 0%{?build_php_module} -%package -n php-digidoc -Summary: PHP bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -Obsoletes: %{name}-php < 0.3.0-1 -Provides: %{name}-php = %{version}-%{release} - -# Don't want provides for php shared objects -# RPM 4.8 style -%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} -%{?filter_setup} -# RPM 4.9 style -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$ - -%description -n php-digidoc -The php-digidoc package contains PHP bindings for the %{name} library. -%endif - - -%if 0%{?build_python_module} -%package -n python-digidoc -Summary: Python bindings for %{name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Obsoletes: %{name}-python < 0.3.0-1 -Provides: %{name}-python = %{version}-%{release} - -# Don't want provides for python shared objects -# RPM 4.8 style -%{?filter_provides_in: %filter_provides_in %{python_sitearch}/.*\.so$} -%{?filter_setup} -# RPM 4.9 style -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{python_sitearch}/.*\\.so$ - -%description -n python-digidoc -The python-digidoc package contains Python bindings for the %{name} -library. -%endif - - %prep %setup -q -%patch0 -p1 - -# Remove bundled copy of minizip -rm -rf src/minizip/ - %build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} +cmake . \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DSWIG_EXECUTABLE=SWIG_EXECUTABLE-NOTFOUND +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} +make install DESTDIR=%{buildroot} +# Those certs come from another package +rm -rf %{buildroot}%{_datadir}/esteid/certs + %check -%if 0%{?build_php_module} -# Minimal load test of php extension -LD_LIBRARY_PATH=%{buildroot}%{_libdir} \ -php --no-php-ini \ - --define extension_dir=${RPM_BUILD_ROOT}%{php_extdir} \ - --define extension=digidoc.so \ - --modules | grep digidoc -%endif +%clean +rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING README RELEASE-NOTES.txt doc/* %{_libdir}/*.so.* %dir %{_sysconfdir}/digidocpp %config(noreplace) %{_sysconfdir}/digidocpp/digidocpp.conf -%{_sysconfdir}/digidocpp/certs/ %{_sysconfdir}/digidocpp/schema/ +%{_bindir}/digidoc-* +%{_mandir}/man1/digidoc-tool.1.* %files devel +%doc AUTHORS COPYING README RELEASE-NOTES.txt doc/* %{_includedir}/digidocpp/ %{_libdir}/pkgconfig/lib*.pc %{_libdir}/*.so -%if 0%{?build_perl_module} -%files -n perl-digidoc -%{perl_vendorarch}/* -%{perl_vendorlib}/* -%endif - -%if 0%{?build_php_module} -%files -n php-digidoc -%{php_extdir}/* -%{_datadir}/php/* -%config(noreplace) %{_sysconfdir}/php.d/digidoc.ini -%endif - -%if 0%{?build_python_module} -%files -n python-digidoc -%{python_sitearch}/* -%endif - %changelog +* Thu Apr 24 2014 Mihkel Vain - 3.8.0.1208-1 +- First package based on new source code from RIA + * Sat Aug 03 2013 Fedora Release Engineering - 0.3.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a847ec1..2d9e5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a567fd16d2ce6205b179850e98c26971 libdigidocpp-0.3.0.tar.bz2 +ce0cb19c4afc74ad08f2f578aaed8a73 libdigidocpp-3.8.0.1208.tar.gz