Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	libneon.spec
@@ -11,7 +11,7 @@ Summary: HTTP and WebDAV client library Version: 0.32.1 Release: 1 -Group: Libraries +Group: Applications/Internet License: GPLv2 URL: https://notroj.github.io/neon Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz @@ -26,14 +26,6 @@ %description %{summary}. -%package doc -Summary: Documentation for %{name} -Group: Documentation -BuildArch: noarch - -%description doc -%{summary}. - %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -46,6 +38,8 @@ %setup -q -n neon-%{version} # >> setup +# Fix compatibility with OpenSSL >=1.1. +sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c # << setup %build @@ -61,18 +55,20 @@ --with-libxml2 \ --with-zlib -make %{?_smp_mflags} # >> build post +#%%make %%{?_smp_mflags} +%make_build # << build post %install rm -rf %{buildroot} # >> install pre # << install pre -%make_install # >> install post +# default make install contains -docs which needs xmlto which fails to run correctly in OBS build environment +%{__make} DESTDIR=%{?buildroot} INSTALL="%{__install} -p" install-lib install-headers install-config # << install post %post -p /sbin/ldconfig @@ -85,18 +81,12 @@ # >> files # << files -%files doc -%defattr(-,root,root,-) -%{_mandir}// -%{_docdir}/* -# >> files doc -# << files doc - %files devel %defattr(-,root,root,-) # >> files devel %{_bindir}/neon-config %{_includedir}/neon %{_libdir}/%{name}.so +%{_libdir}/%{name}.la %{_libdir}/pkgconfig/neon.pc # << files devel
[-] [+]	Added	libneon-xmlto.patch ^
@@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 6272892..373b93a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -45,7 +45,7 @@ INSTALL = @INSTALL@ + transform = @program_transform_name@ + + LIBTOOL = @LIBTOOL@ +-XMLTO = xmlto ++XMLTO = xmlto --skip-validation + GCOV = gcov + XGETTEXT_OPTS = --keyword=_ --keyword=N_ --msgid-bugs-address=neon@lists.manyfish.co.uk \ + --default-domain=neon --flag ne_print_request_header:3:c-format \
[-] [+]	Changed	libneon.yaml ^
@@ -1,15 +1,19 @@ Name: libneon Summary: HTTP and WebDAV client library Version: 0.32.1 -Group: Libraries +Group: Applications/Internet License: GPLv2 URL: 'https://notroj.github.io/neon' Sources: - 'https://notroj.github.io/neon/neon-%{version}.tar.gz' +#Patches: +# - 'libneon-xmlto.patch' #Requires: # - ^^^ + #PkgBR: -# - ^^^ +# # needed for -docs but doesn't work in this version on OBS +# - xmlto PkgConfigBR: - zlib - openssl @@ -23,18 +27,20 @@ - '--with-libproxy' - '--with-libxml2' - '--with-zlib' +# it is make but we want to do it custom so we don't need docs +Builder: none Files: - '%{_libdir}/.so.' AutoSubPackages: - devel -SubPackages: - - Name: doc - Summary: Documentation for %{name} - Group: Documentation - BuildArch: noarch - AutoDepend: false - Files: - - '%{_mandir}//' - - '%{_docdir}/' +#SubPackages: +# - Name: doc +# Summary: Documentation for %{name} +# Group: Documentation +# BuildArch: noarch +# AutoDepend: false +# Files: +# - '%{_mandir}//' +# - '%{_docdir}/'