Skip to content
This repository was archived by the owner on Feb 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/diracos.json
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
"name": "davix",
"packages": [
{
"src": "https://storage-ci.web.cern.ch/storage-ci/davix/R_0_7_6/el6/SRPMS/davix-0.7.6-1.el6.src.rpm",
"src": "https://diracos.web.cern.ch/diracos/SRPM/davix-0.7.6.200.3c48eab-1.el6.src.rpm",
"originalRepo": "https://storage-ci.web.cern.ch/storage-ci/davix/",
"name": "davix"
}
Expand Down
42 changes: 32 additions & 10 deletions patches/davix.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,47 @@
diff -u -r original/davix.spec modified/davix.spec
--- original/davix.spec 2020-04-29 14:09:47.000000000 +0200
+++ modified/davix.spec 2021-07-29 14:27:24.305798955 +0200
@@ -1,5 +1,6 @@
# unversionned doc dir F20 change https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
Only in modified/: davix-0.7.6.200.3c48eab-1.el6.py27.usc4.src.rpm
diff -r -u original/davix.spec modified/davix.spec
--- original/davix.spec 2020-11-10 03:21:20.000000000 +0000
+++ modified/davix.spec 2021-01-28 08:09:13.207702045 +0000
@@ -1,5 +1,5 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%global __cmake cmake3
+%global cmake /usr/bin/cmake

Name: davix
Version: 0.7.6
@@ -24,11 +25,6 @@
Version: 0.7.6.200.3c48eab
@@ -13,8 +13,6 @@
#main lib dependencies
BuildRequires: python2
BuildRequires: libuuid-devel
-BuildRequires: cmake
-BuildRequires: cmake3
BuildRequires: doxygen
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
@@ -25,10 +23,6 @@
# davix-copy dependencies
BuildRequires: gsoap-devel

-# unit tests and abi check
-%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildRequires: abi-compliance-checker
-%endif
-
Requires: %{name}-libs%{?_isa} = %{version}-%{release}

@@ -66,9 +60,9 @@
with Http based protocols (WebDav, Amazon S3, ...).

%package doc
-Summary: Documentation for %{name}
+Summary: Documentation for %{name}
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
-BuildArch: noarch
+BuildArch: noarch
%endif

@@ -87,7 +83,7 @@
%description doc
@@ -89,7 +83,7 @@
%cmake \
-DDOC_INSTALL_DIR=%{_pkgdocdir} \
-DENABLE_THIRD_PARTY_COPY=TRUE \
Expand All @@ -29,11 +50,12 @@ diff -u -r original/davix.spec modified/davix.spec
.
make %{?_smp_mflags}
make doc
@@ -131,7 +127,6 @@
@@ -129,7 +123,7 @@
%files doc
%{_pkgdocdir}/LICENSE
%{_pkgdocdir}/RELEASE-NOTES.md
-%{_pkgdocdir}/html/
+

%files tests
%{_bindir}/davix-unit-tests