#2 Merge EPEL 7 branch to master
Merged 3 years ago by andreamanzi. Opened 3 years ago by ellert.
rpms/ ellert/dmlite merge-and-cleanup  into  master

file modified
-1
@@ -1,3 +1,2 @@ 

  /*.tar.gz

  /*.rpm

- 

file removed
-10
@@ -1,10 +0,0 @@ 

- --- dmlite-1.11.1/python/CMakeLists.txt~	2019-01-30 18:36:25.183737162 +0000

- +++ dmlite-1.11.1/python/CMakeLists.txt	2019-01-30 18:36:30.267729790 +0000

- @@ -1,6 +1,6 @@

-  cmake_minimum_required (VERSION 2.6)

-  

- -find_package(Boost COMPONENTS python REQUIRED)

- +find_package(Boost COMPONENTS python27 REQUIRED)

-  find_package(PythonLibs)

-  

-  if ( CMAKE_INSTALL_PREFIX STREQUAL "/" )

file added
+90
@@ -0,0 +1,90 @@ 

+ diff -ur dmlite-1.14.1.orig/scripts/StAR-accounting/star-accounting.py dmlite-1.14.1/scripts/StAR-accounting/star-accounting.py

+ --- dmlite-1.14.1.orig/scripts/StAR-accounting/star-accounting.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/scripts/StAR-accounting/star-accounting.py	2020-11-01 21:21:03.885665263 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  ###########################################################################

+  #

+  # star-accounting

+ diff -ur dmlite-1.14.1.orig/shell/src/argus.py dmlite-1.14.1/shell/src/argus.py

+ --- dmlite-1.14.1.orig/shell/src/argus.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/argus.py	2020-11-01 21:24:40.692135650 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  # Simplified Argus banning data extracted from server configuration

+  # read directly by its WSDL interface.

+  #

+ diff -ur dmlite-1.14.1.orig/shell/src/dmlite-mysql-dirspaces.py dmlite-1.14.1/shell/src/dmlite-mysql-dirspaces.py

+ --- dmlite-1.14.1.orig/shell/src/dmlite-mysql-dirspaces.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/dmlite-mysql-dirspaces.py	2020-11-01 21:21:03.885665263 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  #

+  # A script that calculates the space occupied by files in every directory

+  # and can set the metadata filesize field with it, for the first N levels

+ diff -ur dmlite-1.14.1.orig/shell/src/dmlite-prom.py dmlite-1.14.1/shell/src/dmlite-prom.py

+ --- dmlite-1.14.1.orig/shell/src/dmlite-prom.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/dmlite-prom.py	2020-11-01 21:24:40.693135652 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  #

+  # Dump DPM DOME information in a format that can be scraped

+  # by prometheus Node exporter text collector

+ diff -ur dmlite-1.14.1.orig/shell/src/dmlite-shell dmlite-1.14.1/shell/src/dmlite-shell

+ --- dmlite-1.14.1.orig/shell/src/dmlite-shell	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/dmlite-shell	2020-11-01 21:24:40.693135652 +0100

+ @@ -1,4 +1,4 @@

+ -#! /usr/bin/python2

+ +#! /usr/bin/python3

+  # dmliteshell.py

+  """

+  This file implements the DMLite shell.

+ diff -ur dmlite-1.14.1.orig/shell/src/dome-info-provider.py dmlite-1.14.1/shell/src/dome-info-provider.py

+ --- dmlite-1.14.1.orig/shell/src/dome-info-provider.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/dome-info-provider.py	2020-11-01 21:21:03.883665259 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  

+  import argparse

+  import socket

+ diff -ur dmlite-1.14.1.orig/shell/src/dpm-storage-summary.cgi dmlite-1.14.1/shell/src/dpm-storage-summary.cgi

+ --- dmlite-1.14.1.orig/shell/src/dpm-storage-summary.cgi	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/dpm-storage-summary.cgi	2020-11-01 21:21:03.884665261 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  # CGI wrapper for dpm-storage-summary.py

+  #

+  # Parameters read from environment:

+ diff -ur dmlite-1.14.1.orig/shell/src/dpm-storage-summary.py dmlite-1.14.1/shell/src/dpm-storage-summary.py

+ --- dmlite-1.14.1.orig/shell/src/dpm-storage-summary.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/dpm-storage-summary.py	2020-11-01 21:21:03.885665263 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  # WLCG Storage Resource Reporting implementation for DPM

+  # * https://docs.google.com/document/d/1yzCvKpxsbcQC5K9MyvXc-vBF1HGPBk4vhjw3MEXoXf8/edit

+  # * https://twiki.cern.ch/twiki/bin/view/LCG/AccountingTaskForce

+ diff -ur dmlite-1.14.1.orig/shell/src/utils.py dmlite-1.14.1/shell/src/utils.py

+ --- dmlite-1.14.1.orig/shell/src/utils.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/shell/src/utils.py	2020-11-01 21:24:40.693135652 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  from __future__ import absolute_import

+  from __future__ import print_function

+  from __future__ import division

+ diff -ur dmlite-1.14.1.orig/tests/dpm/dpm-tester.py dmlite-1.14.1/tests/dpm/dpm-tester.py

+ --- dmlite-1.14.1.orig/tests/dpm/dpm-tester.py	2020-09-24 12:12:28.000000000 +0200

+ +++ dmlite-1.14.1/tests/dpm/dpm-tester.py	2020-11-01 21:21:03.886665265 +0100

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/python2

+ +#!/usr/bin/python3

+  from __future__ import print_function, division, absolute_import

+  

+  import gfal2

@@ -1,12 +0,0 @@ 

- Index: shell/src/CMakeLists.txt

- ===================================================================

- --- shell/src/CMakeLists.txt	(revision 11811)

- +++ shell/src/CMakeLists.txt	(working copy)

- @@ -14,5 +14,5 @@

-          DESTINATION   ${INSTALL_PFX_USR}/bin)

-  

-  install(FILES         __init__.py interpreter.py dbutils.py executor.py

- -	DESTINATION   ${INSTALL_PYTHON_SITE_PACKAGES}/dmliteshell

- +	DESTINATION   ${PYTHON_SITE_PACKAGES}/dmliteshell

-  )

- 

file modified
+259 -343
@@ -1,16 +1,10 @@ 

- %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}

- %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")}

- 

- %{!?dmlite_test: %global dmlite_tests 0}

+ # To enable dmlite-test package,

+ # pass the "--with dmlite_tests" flag to the rpmbuild command

+ %bcond_with dmlite_tests

  

  # By default we build without AddressSanitizer. To enable it,

  # pass the "--with asan" flag to the rpmbuild command

- %bcond_without asan

- 

- # additional macros based on environment or existing definitions

- %if %{?_with_asan:1}%{!?_with_asan:0}

-   %define devtoolset devtoolset-8

- %endif

+ %bcond_with asan

  

  # systemd definition, to do the right thing if we need to restart daemons

  %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7
@@ -19,59 +13,74 @@ 

  %global systemd 0

  %endif

  

- %if %{?fedora}%{!?fedora:0} >= 27

- %global cpp11 ON

+ %if %{?fedora}%{!?fedora:0} >= 31 || %{?rhel}%{!?rhel:0} >= 8

+ %global withlcgdm 0

  %else

- %global cpp11 OFF

+ %global withlcgdm 1

  %endif

  

+ # These settings have to be compatible with the logic in

+ # python/CMakeLists.txt

+ 

+ %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8

+   %global py_app_version 3

+   %global with_python2_libs 0

+   %global with_python3_libs 1

+ %else

+   %global py_app_version 2

+   %global with_python2_libs 1

+   %global with_python3_libs 1

+ %endif

+ 

+ # Handle new cmake macros

+ %undefine __cmake_in_source_build

+ %undefine __cmake3_in_source_build

+ 

  %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}

  

  Name:					dmlite

- Version:				1.14.0

- Release:				3%{?dist}

+ Version:				1.14.2

+ Release:				1%{?dist}

  Summary:				Lcgdm grid data management and storage framework

  License:				ASL 2.0

  URL:					https://gitlab.cern.ch/lcgdm/dmlite

  # The source of this package was pulled from upstream's vcs. Use the

  # following commands to generate the tarball:

  # git clone http://gitlab.cern.ch/lcgdm/dmlite.git

- # cd dmlite && git archive --prefix dmlite-1.14.0/ tags/v1.14.0e | gzip > dmlite-1.14.0.tar.gz

+ # cd dmlite && git archive --prefix dmlite-1.14.2/ tags/v1.14.2 | gzip > dmlite-1.14.2.tar.gz

  Source0:				%{name}-%{version}.tar.gz

- ## Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1108325, Waiting for memcached fix for > 1.0 version

- Patch0:                                 patch_memcache_fix.patch

- Patch1:                                 dmlite-boost169.patch

- %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7

- BuildRequires:  gcc-c++

- BuildRequires:                  boost-devel >= 1.48.0

+ Patch0:					dmlite-python3.patch

+ 

+ BuildRequires:			boost-devel >= 1.48.0

+ 

+ %if %{with_python2_libs}

+ BuildRequires:			python2-devel

+ %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8

+ BuildRequires:			boost-python2-devel

  %else

- BuildRequires:                  boost148-devel >= 1.48.0

+ BuildRequires:			boost-python

+ %endif

  %endif

  

- %if %{?fedora}%{!?fedora:0} >= 29

- BuildRequires:                  boost-python2-devel

+ %if %{with_python3_libs}

+ BuildRequires:			python%{python3_pkgversion}-devel

+ BuildRequires:			boost-python%{python3_pkgversion}-devel

  %endif

  

- BuildRequires:			cmake

+ BuildRequires:			gcc-c++

  BuildRequires:			cmake3

  BuildRequires:			cppunit-devel

  BuildRequires:			doxygen

  BuildRequires:			graphviz

  BuildRequires:			openssl-devel

- BuildRequires:			python2-devel

  BuildRequires:			zlib-devel

  

- %if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 7

- BuildRequires:      python%{python3_pkgversion}-devel

- BuildRequires:      boost-python%{python3_pkgversion}-devel

- %endif

- 

  # Plugins require

  BuildRequires:			libmemcached-devel

- %if %{?fedora}%{!?fedora:0} >= 28

- BuildRequires:      mariadb-connector-c-devel

+ %if %{?fedora}%{!?fedora:0} >= 28 || %{?rhel}%{!?rhel:0} >= 8

+ BuildRequires:			mariadb-connector-c-devel

  %else

- BuildRequires:      mysql-devel

+ BuildRequires:			mysql-devel

  %endif

  BuildRequires:			protobuf-devel

  BuildRequires:			davix-devel >= 0.6.7
@@ -83,26 +92,19 @@ 

  BuildRequires:			gridsite-devel

  BuildRequires:			gsoap-devel

  BuildRequires:			httpd-devel

- BuildRequires:      jansson-devel

+ BuildRequires:			jansson-devel

  BuildRequires:  		libbsd-devel

- %if %{?fedora}%{!?fedora:0} <= 30

+ %if %{withlcgdm}

  BuildRequires:			lcgdm-devel

  BuildRequires:			dpm-devel

  %endif

+ BuildRequires:			xrootd-devel >= 1:5.0.2

+ BuildRequires:			xrootd-server-devel >= 1:5.0.2

+ BuildRequires:			xrootd-private-devel >= 1:5.0.2

  

- # Address sanitizer builds (mock libasan5 sclo config)

- %if %{?_with_asan:1}%{!?_with_asan:0}

- %if %{?rhel}%{!?rhel:0} == 6

- BuildRequires: sl-release-scl

- BuildRequires: %{devtoolset} %{devtoolset}-libasan-devel

- %else

- %if %{?rhel}%{!?rhel:0} >= 7

- BuildRequires: epel-release

- BuildRequires: %{devtoolset} %{devtoolset}-libasan-devel

- %else

- BuildRequires: libasan

- %endif

- %endif

+ # Address sanitizer builds

+ %if %{with asan}

+ BuildRequires:			libasan

  %endif

  

  %description
@@ -131,12 +133,10 @@ 

  Requires:	mod_ssl%{?_isa}

  

  %description apache-httpd

- This package provides the HTTP/WebDAV frontend to DMLite. It's used for DPM and Dynafed

- 

- 

+ This package provides the HTTP/WebDAV frontend to DMLite. It's used

+ for DPM and Dynafed

  

  %files apache-httpd

- %defattr(-,root,root,-)

  %{_bindir}/htcopy

  %{_mandir}/man1/htcopy.1*

  %doc src/plugins/apache-httpd/src/client/README LICENSE
@@ -150,31 +150,28 @@ 

  %config(noreplace) %{_sysconfdir}/httpd/conf.d/*

  %config(noreplace) %{_sysconfdir}/cron.d/*

  

- 

- %if %{?fedora}%{!?fedora:0} <= 30

+ %if %{withlcgdm}

  %package dpmhead

  Summary:  EMI DPM Head Node (MySQL)

  Requires: bdii

  Requires: dpm%{?_isa} >= 1.10

- Requires: dmlite-dpm-dsi = %{version}

+ Requires: dmlite-dpm-dsi = %{version}-%{release}

  Requires: dpm-name-server-mysql%{?_isa} >= 1.10

  Requires: dpm-perl%{?_isa} >= 1.10

  Requires: dpm-python%{?_isa} >= 1.10

  Requires: dpm-rfio-server%{?_isa} >= 1.10

  Requires: dpm-server-mysql%{?_isa} >= 1.10

  Requires: dpm-srm-server-mysql%{?_isa} >= 1.10

- Requires: dmlite-plugins-domeadapter = %{version}

- Requires: dmlite-dome = %{version}

- Requires: dmlite-shell = %{version}

- Requires: dmlite-plugins-mysql = %{version}

+ Requires: dmlite-plugins-domeadapter = %{version}-%{release}

+ Requires: dmlite-dome = %{version}-%{release}

+ Requires: dmlite-shell = %{version}-%{release}

+ Requires: dmlite-plugins-mysql = %{version}-%{release}

  Requires: edg-mkgridmap

  Requires: fetch-crl

- Requires: dmlite-apache-httpd = %{version}

+ Requires: dmlite-apache-httpd = %{version}-%{release}

  Requires: davix >= 0.6.7

- %if %{?fedora}%{!?fedora:0} <= 30

- Requires: dmlite-plugins-adapter = %{version}

+ Requires: dmlite-plugins-adapter = %{version}-%{release}

  Requires: dpm-devel%{?_isa} >= 1.10

- %endif

  Obsoletes: emi-dpm_mysql

  

  %description dpmhead
@@ -188,26 +185,23 @@ 

  %{_prefix}/share/dmlite/StAR-accounting

  %endif

  

- %if %{?fedora}%{!?fedora:0} <= 30

+ %if %{withlcgdm}

  %package dpmdisk

  Summary:  EMI DPM Disk Node

  Requires: dpm%{?_isa} >= 1.10

  Requires: dpm-perl%{?_isa} >= 1.10

  Requires: dpm-python%{?_isa} >= 1.10

  Requires: dpm-rfio-server%{?_isa} >= 1.10

- Requires: dmlite-dpm-dsi = %{version}

- Requires: dmlite-plugins-domeadapter = %{version}

- Requires: dmlite-dome = %{version}

- Requires: dmlite-shell = %{version}

+ Requires: dmlite-dpm-dsi = %{version}-%{release}

+ Requires: dmlite-plugins-domeadapter = %{version}-%{release}

+ Requires: dmlite-dome = %{version}-%{release}

+ Requires: dmlite-shell = %{version}-%{release}

  Requires: edg-mkgridmap

  Requires: fetch-crl

- Requires: dmlite-apache-httpd = %{version}

+ Requires: dmlite-apache-httpd = %{version}-%{release}

  Requires: davix >= 0.6.7

- %if %{?fedora}%{!?fedora:0} <= 30

- Requires: dmlite-plugins-adapter = %{version}

+ Requires: dmlite-plugins-adapter = %{version}-%{release}

  Requires: dpm-devel%{?_isa} >= 1.10

- %endif

- 

  Obsoletes: emi-dpm_disk

  

  %description dpmdisk
@@ -219,34 +213,34 @@ 

  

  %files dpmdisk

  %{_prefix}/share/dmlite/filepull

- 

  %endif

  

- 

  %package dpmhead-domeonly

  Summary:  DPM Head Node (MySQL)

+ %if ! %{?rhel}%{!?rhel:0} == 8

  Requires: bdii

+ %endif

  

- Requires: dmlite-dpm-dsi = %{version}

- Requires: dmlite-plugins-domeadapter = %{version}

- Requires: dmlite-dome = %{version}

- Requires: dmlite-shell = %{version}

- Requires: dmlite-plugins-mysql = %{version}

+ Requires: dmlite-dpm-dsi = %{version}-%{release}

+ Requires: dmlite-plugins-domeadapter = %{version}-%{release}

+ Requires: dmlite-dome = %{version}-%{release}

+ Requires: dmlite-shell = %{version}-%{release}

+ Requires: dmlite-plugins-mysql = %{version}-%{release}

  Requires: edg-mkgridmap

  Requires: fetch-crl

- Requires: dmlite-apache-httpd = %{version}

+ Requires: dmlite-apache-httpd = %{version}-%{release}

  Requires: davix >= 0.6.7

- Requires: xrootd >= 1:4.12.3

+ Requires: xrootd >= 1:5.0.2

  

  Obsoletes: emi-dpm_mysql

  Obsoletes: dpmhead

- Conflicts: dpm%{?_isa}

- Conflicts: dpm-devel%{?_isa}

- Conflicts: dpm-name-server-mysql%{?_isa}

- Conflicts: dpm-perl%{?_isa}

- Conflicts: dpm-rfio-server%{?_isa}

- Conflicts: dpm-server-mysql%{?_isa}

- Conflicts: dpm-srm-server-mysql%{?_isa}

+ Conflicts: dpm

+ Conflicts: dpm-devel

+ Conflicts: dpm-name-server-mysql

+ Conflicts: dpm-perl

+ Conflicts: dpm-rfio-server

+ Conflicts: dpm-server-mysql

+ Conflicts: dpm-srm-server-mysql

  Conflicts: dmlite-plugins-adapter

  

  %description dpmhead-domeonly
@@ -255,26 +249,28 @@ 

  data such as HTTP, Xrootd, GridFTP

  This is a metapackage providing all required daemons for a DPM Head Node.

  

+ %files dpmhead-domeonly

+ %{_prefix}/share/dmlite/dbscripts

+ %{_prefix}/share/dmlite/filepull

+ %{_prefix}/share/dmlite/StAR-accounting

+ 

  %package dpmdisk-domeonly

  Summary:  DPM Disk Node

- 

- Requires: dmlite-dpm-dsi = %{version}

- 

- Requires: dmlite-plugins-domeadapter = %{version}

- Requires: dmlite-dome = %{version}

+ Requires: dmlite-dpm-dsi = %{version}-%{release}

+ Requires: dmlite-plugins-domeadapter = %{version}-%{release}

+ Requires: dmlite-dome = %{version}-%{release}

  Requires: edg-mkgridmap

  Requires: fetch-crl

- Requires: dmlite-apache-httpd = %{version}

- 

+ Requires: dmlite-apache-httpd = %{version}-%{release}

  Requires: davix >= 0.6.7

  

  Obsoletes: emi-dpm_disk

  Obsoletes: dpmdisk

- Conflicts: dpm%{?_isa}

- Conflicts: dpm-devel%{?_isa}

- Conflicts: dpm-perl%{?_isa}

- Conflicts: dpm-rfio-server%{?_isa}

- Conflicts: dmlite-plugins-adapter = %{version}

+ Conflicts: dpm

+ Conflicts: dpm-devel

+ Conflicts: dpm-perl

+ Conflicts: dpm-rfio-server

+ Conflicts: dmlite-plugins-adapter

  

  %description dpmdisk-domeonly

  The Disk Pool Manager (DPM) creates a Grid storage element from a set
@@ -283,33 +279,27 @@ 

  This is a metapackage providing all required daemons for a DPM

  Disk Node.

  

+ %files dpmdisk-domeonly

+ %{_prefix}/share/dmlite/filepull

  

  %package libs

  Summary:			Libraries for dmlite packages

  

- # transition fix for package merge dmlite-*.src.rpm to dmlite.src.rpm

- Obsoletes:			dmlite-plugins-adapter-debuginfo < 0.7.0-1

- Obsoletes:			dmlite-plugins-mysql-debuginfo < 0.7.0-1

- Obsoletes:			dmlite-plugins-memcache-debuginfo < 0.7.0-1

- Obsoletes:			dmlite-plugins-profiler-debuginfo < 0.7.0-1

- Obsoletes:			dmlite-plugins-librarian-debuginfo < 0.7.0-1

- Obsoletes:			dmlite-shell-debuginfo < 0.7.0-1

- 

- # dpm-xrootd was the standalone project/package. Now dmlite-dpm-xrootd is part of dmlite

+ # dpm-xrootd was the standalone project/package.

+ # Now dmlite-dpm-xrootd is part of dmlite

  Conflicts:      dpm-xrootd

  

- # # dpm-dsi was the standalone project/package. Now it's one of the dmlite plugins

+ # dpm-dsi was the standalone project/package.

+ # Now it's one of the dmlite plugins

  Conflicts:      dpm-dsi < %{version}

  

- # lcgdm-dav was the standalone project/package. Now it's built with the dmlite plugins, and we don't want 

+ # lcgdm-dav was the standalone project/package.

+ # Now it's built with the dmlite plugins, and we don't want

  Conflicts:      lcgdm-dav-server < %{version}

  Conflicts:      lcgdm-dav < %{version}

  Conflicts:      lcgdm-dav-libs < %{version}

  Conflicts:      mod_lcgdm_dav < %{version}

  

- # This was due to the switch to boost 1.48, linked to the bugs in propertytree

- Conflicts:      dpm-xrootd <= 3.6.0

- 

  # Versions prior to this one do not properly do accounting on directories

  Conflicts:      lcgdm-libs <= 1.10

  
@@ -317,19 +307,13 @@ 

  # the C calls dmlite_copypush/pull

  Conflicts:      dynafed < 1.5.0

  

- # Not really necessary, just better to limit the space for mistakes

- Conflicts:      dpm-dsi < 1.9.10

- 

  %description libs

  This package provides the core libraries of dmlite.

  

  %package dome

  Summary:			The dome daemon

  Requires:     httpd

- Requires:     xrootd >= 1:4.12.3

- BuildRequires:     xrootd-devel >= 1:4.12.3

- BuildRequires:     xrootd-server-devel >= 1:4.12.3

- BuildRequires:     xrootd-private-devel >= 1:4.12.3

+ Requires:     xrootd >= 1:5.0.2

  

  %description dome

  This package provides the binaries necessary to run the dome daemon.
@@ -343,57 +327,44 @@ 

  

  %package docs

  Summary:			Documentation files for dmlite

- 

+ BuildArch:			noarch

  

  %description docs

  This package contains the man pages and HTML documentation for dmlite.

  

- 

  %package private-devel

  Summary:			Private development libraries and headers for dmlite

  Requires:			%{name}-devel%{?_isa} = %{version}-%{release}

- %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7

- BuildRequires:                  boost-devel >= 1.48.0

- %else

- BuildRequires:                  boost148-devel >= 1.48.0

- %endif

+ Requires:			boost-devel >= 1.48.0

  Obsoletes:			dpm-xrootd-devel

  

- 

  %description private-devel

  Private development headers for dmlite. Provided for the development of

  dmlite plugins only, no API compatibility is guaranteed on these headers.

  

- 

- 

  %package dpm-tester

  Summary:      The dpm tester tool

- Requires:     python2

  Requires:     gfal2-plugin-http

  Requires:     gfal2-plugin-xrootd

  Requires:     gfal2-plugin-srm

  Requires:     gfal2-plugin-gridftp

  Requires:     gfal2-plugin-file

- %if %{?fedora}%{!?fedora:0} >= 28

- Requires:     python2-gfal2

+ %if %{py_app_version} == 3

+ Requires:     python%{python3_pkgversion}-gfal2

  %else

  Requires:     gfal2-python

  %endif

- %if %{?rhel}%{!?rhel:0} == 6

- Requires:     python-argparse

- %else

- %if %{?rhel}%{!?rhel:0} == 7

- Requires:     python-libs

- %else

- Requires:     python2-libs

- %endif

- %endif

+ Requires:     python%{py_app_version}-libs

+ Requires:     python%{py_app_version}

+ 

  %description dpm-tester

  Tool that is useful to test the main features of a DPM setup

  

+ %files dpm-tester

+ %{_bindir}/dpm-tester.py

+ 

  %package dpm-dsi

  Summary:	Disk Pool Manager (DPM) plugin for the Globus GridFTP server

- Group:		Applications/Internet

  Requires:	globus-gridftp-server-progs >= 13.20

  Requires:	dmlite-libs = %{version}-%{release}

  
@@ -408,31 +379,28 @@ 

  Requires(postun):   	initscripts

  %endif

  

- Provides:			DPM-gridftp-server = %{version}-%{release}

+ Provides:		DPM-gridftp-server = %{version}-%{release}

  Obsoletes:		DPM-gridftp-server < %{version}-%{release}

- Provides:			DPM-DSI = %{version}-%{release}

+ Provides:		DPM-DSI = %{version}-%{release}

  Obsoletes:		DPM-DSI < %{version}-%{release}

  Obsoletes:		dpm-dsi < %{version}-%{release}

  

  %description dpm-dsi

- The dpm-dsi package provides a Disk Pool Manager (DPM) plugin for the 

+ The dpm-dsi package provides a Disk Pool Manager (DPM) plugin for the

  Globus GridFTP server, following the Globus Data Storage Interface (DSI).

  

  The Disk Pool Manager (DPM) is a lightweight storage solution for grid sites.

- It offers a simple way to create a disk-based grid storage element and 

- supports relevant protocols (SRM, gridFTP, RFIO) for file 

+ It offers a simple way to create a disk-based grid storage element and

+ supports relevant protocols (SRM, gridFTP, RFIO) for file

  management and access.

  

  Globus provides open source grid software, including a server implementation

- of the GridFTP protocol. This plugin implements the DPM backend specifics 

+ of the GridFTP protocol. This plugin implements the DPM backend specifics

  required to expose the data using this protocol.

  

- 

- 

  %files dpm-dsi

- %defattr(-,root,root)

  %if %systemd

- %attr(0644,root,root) %{_unitdir}/dpm-gsiftp.service

+ %{_unitdir}/dpm-gsiftp.service

  %else

  %{_initrddir}/dpm-gsiftp

  %endif
@@ -448,7 +416,7 @@ 

  %else

  	/sbin/chkconfig --add dpm-gsiftp

  %endif

- /sbin/ldconfig

+ %{?ldconfig}

  

  %preun dpm-dsi

  if [ $1 -eq 0 ] ; then
@@ -462,7 +430,7 @@ 

  fi

  

  %postun dpm-dsi

- /sbin/ldconfig 

+ %{?ldconfig}

  if [ $1 -ge 1 ]; then

  %if %systemd

          /bin/systemctl try-restart dpm-gsiftp.service > /dev/null 2>&1 || :
@@ -471,48 +439,45 @@ 

  %endif

  fi

  

- %if %{?fedora}%{!?fedora:0} >= 26

+ %if %{with_python2_libs}

  %package -n python2-dmlite

- %{?python_provide:%python_provide python2-dmlite}

- %else

- %package -n python-dmlite

- %endif

  Summary:			Python wrapper for dmlite

+ %{?python_provide:%python_provide python2-dmlite}

  

- %if %{?fedora}%{!?fedora:0} >= 26

  %description -n python2-dmlite

- %else

- %description -n python-dmlite

- %endif

  This package provides a python wrapper for dmlite.

  

- %if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 7

+ %files -n python2-dmlite

+ %{python2_sitearch}/pydmlite.so

+ %endif

+ 

+ %if %{with_python3_libs}

  %package -n python%{python3_pkgversion}-dmlite

  Summary:                        Python wrapper for dmlite

- Group:                          Development/Libraries

- %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}

+ %{?python_provide:%python_provide python%{python3_pkgversion}-dmlite}

  

  %description -n python%{python3_pkgversion}-dmlite

  This package provides a python wrapper for dmlite.

  

  %files -n python%{python3_pkgversion}-dmlite

- %defattr(-,root,root,-)

  %{python3_sitearch}/pydmlite.so

  %endif

  

+ %if %{with dmlite_tests}

  %package test

  Summary:			All sorts of tests for dmlite interfaces

  

  %description test

- Set of C,CPP and Python tests for dmlite interfaces and plug-ins.

+ Set of C, CPP and Python tests for dmlite interfaces and plug-ins.

+ 

+ %files test

+ %{_libdir}/dmlite/test

+ %endif

  

  %package plugins-memcache

  Summary:			Memcached plugin for dmlite

  Requires:			%{name}-libs%{?_isa} = %{version}-%{release}

  

- # Merge migration

- Obsoletes:			dmlite-plugins-memcache < 0.7.0-1

- 

  %description plugins-memcache

  This package provides the memcached plug-in for dmlite. It provides a

  memcached based layer for the Lcgdm nameserver.
@@ -521,57 +486,63 @@ 

  Summary:			Monitoring plugin for dmlite

  Requires:			%{name}-libs%{?_isa} = %{version}-%{release}

  

- # Merge migration

- Obsoletes:			dmlite-plugins-profiler < 0.7.0-1

- 

  %description plugins-profiler

  This package provides the profiler plug-in for dmlite. This plug-in

  provides multiple performance measurement tools for dmlite.

  

- 

  %package plugins-librarian

  Summary:                        Librarian plugin for dmlite

  Requires:                       %{name}-libs%{?_isa} = %{version}-%{release}

  

- # Merge migration

- Obsoletes:                      dmlite-plugins-librarian < 0.7.0-1

- 

  %description plugins-librarian

  This package provides the librarian plug-in for dmlite.

  

- 

- 

- 

  %package shell

  Summary:			Shell environment for dmlite

  

- Requires:    			python-ldap

- %if %{?fedora}%{!?fedora:0} >= 26

- Requires:			python2-dmlite = %{version}

- Requires:     			python2-libs

- Requires:			python2-dateutil

- Requires:                       python2-mysql

- Requires:                       python2-pycurl

- Requires:     			python2-rpm

- Requires:			davix >= 0.6.7

- Requires:			m2crypto

- %else

- Requires:			python-dmlite = %{version}

- Requires:     			python-libs

- Requires:			python-dateutil

- Requires:                       MySQL-python

- Requires:                       python-pycurl

- Requires:     			rpm-python

- Requires:			davix >= 0.6.7

- Requires:			m2crypto

+ Requires:     davix >= 0.6.7

+ 

+ %if %{py_app_version} == 2

+ Requires:     python2-dmlite = %{version}-%{release}

+ Requires:     python-ldap

+ Requires:     python2-libs

+ Requires:     python2-dateutil

+ Requires:     MySQL-python

+ Requires:     python-pycurl

+ Requires:     rpm-python

+ Requires:     m2crypto

  %endif

  

- Obsoletes:			dmlite-shell < %{version}-%{release}

+ %if %{py_app_version} == 3

+ Requires:     python%{python3_pkgversion}-dmlite = %{version}-%{release}

+ Requires:     python%{python3_pkgversion}-ldap

+ Requires:     python%{python3_pkgversion}-libs

+ Requires:     python%{python3_pkgversion}-dateutil

+ Requires:     python%{python3_pkgversion}-mysql

+ Requires:     python%{python3_pkgversion}-pycurl

+ Requires:     python%{python3_pkgversion}-rpm

+ Requires:     python%{python3_pkgversion}-m2crypto

+ %endif

  

  %description shell

  This package provides a shell environment for dmlite. It includes useful

  commands for system administration, testers and power users.

  

+ %files shell

+ %{_bindir}/dmlite-shell

+ %{_bindir}/dpm-storage-summary.py

+ %{_bindir}/dpm-storage-summary.cgi

+ %{_bindir}/dmlite-mysql-dirspaces.py

+ %{_bindir}/dome-info-provider.py

+ %{_sharedstatedir}/bdii/gip/provider/dome-info-exec

+ %config(noreplace) %{_sysconfdir}/sysconfig/dpminfo

+ %if %{py_app_version} == 2

+ %{python2_sitelib}/dmliteshell

+ %else

+ %{python3_sitelib}/dmliteshell

+ %endif

+ %doc LICENSE README RELEASE-NOTES

+ 

  %package dpm-xrootd

  Summary:			XROOT interface to the Disk Pool Manager (DPM)

  Requires:			%{name}-libs%{?_isa} = %{version}-%{release}
@@ -579,26 +550,18 @@ 

  Requires(preun):	initscripts

  Requires(post):		chkconfig

  Requires(postun):	initscripts

- Requires:		xrootd >= 1:4.12.3

- Requires:		xrootd-client >= 1:4.12.3

- Requires:		xrootd-selinux >= 1:4.12.3

+ Requires:		xrootd >= 1:5.0.2

+ Requires:		xrootd-client >= 1:5.0.2

+ Requires:		xrootd-selinux >= 1:5.0.2

  Conflicts:		vomsxrd <= 1:0.2.0

  Conflicts:		xrootd-server-atlas-n2n-plugin <= 2.1

  Conflicts:		xrootd-alicetokenacc <= 1.2.2

- BuildRequires:	openssl-devel

- BuildRequires:	xrootd-server-devel >= 1:4.12.3

- %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7

- BuildRequires:                  boost-devel >= 1.48.0

- %else

- BuildRequires:                  boost148-devel >= 1.48.0

- %endif

  Obsoletes:              dpm-xrootd

  

  %description dpm-xrootd

  This package contains plugins for XROOTD to allow it to provide

  access to DPM managed storage via the XROOT protocol.

  

- 

  %preun dpm-xrootd

  if [ "$1" = "0" ]; then

      /sbin/service xrootd stop >/dev/null 2>&1 || :
@@ -606,52 +569,47 @@ 

  fi

  

  %postun dpm-xrootd

- /sbin/ldconfig

+ %{?ldconfig}

  if [ "$1" -ge "1" ] ; then

      /sbin/service xrootd condrestart >/dev/null 2>&1 || :

      /sbin/service cmsd condrestart >/dev/null 2>&1 || :

  fi

  

  %files dpm-xrootd

- %defattr(-,root,root)

  %config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmdisk.cfg

  %config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmfedredir_atlas.cfg

  %config(noreplace) %{_sysconfdir}/xrootd/xrootd-dpmredir.cfg

- %{_libdir}/libXrdDPMDiskAcc-4.so

- %{_libdir}/libXrdDPMDiskAcc.so-4.3

- %{_libdir}/libXrdDPMFinder-4.so

- %{_libdir}/libXrdDPMFinder.so-4.3

- %{_libdir}/libXrdDPMOss-4.so

- %{_libdir}/libXrdDPMOss.so-4.3

- %{_libdir}/libXrdDPMRedirAcc-4.so

- %{_libdir}/libXrdDPMRedirAcc.so-4.3

- %{_libdir}/libXrdDPMStatInfo-4.so

- %{_libdir}/libXrdDPMStatInfo.so-4.3

- %{_libdir}/libXrdDPMCks-4.so

- %{_libdir}/libXrdDPMCks.so-4.3

- 

+ %{_libdir}/libXrdDPMDiskAcc-5.so

+ %{_libdir}/libXrdDPMDiskAcc.so-5.3

+ %{_libdir}/libXrdDPMFinder-5.so

+ %{_libdir}/libXrdDPMFinder.so-5.3

+ %{_libdir}/libXrdDPMOss-5.so

+ %{_libdir}/libXrdDPMOss.so-5.3

+ %{_libdir}/libXrdDPMRedirAcc-5.so

+ %{_libdir}/libXrdDPMRedirAcc.so-5.3

+ %{_libdir}/libXrdDPMStatInfo-5.so

+ %{_libdir}/libXrdDPMStatInfo.so-5.3

+ %{_libdir}/libXrdDPMCks-5.so

+ %{_libdir}/libXrdDPMCks.so-5.3

  

  %package plugins-mysql

  Summary:			MySQL plugin for dmlite

  Requires:			%{name}-libs%{?_isa} = %{version}-%{release}

  

- Obsoletes:			dmlite-plugins-mysql < 0.7.0-1

- 

  %description plugins-mysql

  This package provides the MySQL plug-in for dmlite.

  

- %if %{?fedora}%{!?fedora:0} <=30

+ %if %{withlcgdm}

  %package plugins-adapter

  Summary:			Adapter plugin for dmlite

  Requires:			%{name}-libs%{?_isa} = %{version}-%{release}

  Requires:			dpm-libs >= 1.8.8

  Requires:			lcgdm-libs >= 1.8.8

- Obsoletes:			dmlite-plugins-adapter < 0.7.0-1

  

  %description plugins-adapter

- This package provides the adapter plug-in for dmlite. This plug-in provides both

- a name-space and pool management implementation which fallback to forwarding

- calls to the old LcgDM DPNS and DPM daemons.

+ This package provides the adapter plug-in for dmlite. This plug-in

+ provides both a name-space and pool management implementation which

+ fallback to forwarding calls to the old LcgDM DPNS and DPM daemons.

  

  %files plugins-adapter

  %{_libdir}/dmlite/plugin_adapter.so
@@ -664,75 +622,53 @@ 

  Requires:     %{name}-libs%{?_isa} = %{version}-%{release}

  

  %description plugins-domeadapter

- This package provides the next-generation adapter plug-in for dmlite, which uses

- dome and does not depend on the old LcgDM DPNS and DPM daemons.

+ This package provides the next-generation adapter plug-in for dmlite,

+ which uses dome and does not depend on the old LcgDM DPNS and DPM

+ daemons.

  

  %package puppet-dpm

  Summary:                        Puppet modules for DPM configuration

  BuildArch:                      noarch

- Obsoletes:                      dmlite-puppet-dpm < %{version}-%{release}

  

  # Do not check any files in the puppet dir for requires

- # Fedora

  %global __requires_exclude_from ^%{_prefix}/share/dmlite/puppet/modules/.*$

- # EPEL

- %filter_requires_in %{_prefix}/share/dmlite/puppet

- %filter_setup

  

  %description puppet-dpm

  This package provides the modules for the DPM configuration via puppet

  

  %prep

- %setup -q -n %{name}-%{version}

- %if %{?fedora}%{!?fedora:0} >= 21

- %patch0

- %endif

- %if %{?fedora}%{!?fedora:0} >= 30

- %patch1 -p1

- %endif

- 

- %global build_flags -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON

- %if %systemd

- %global build_flags %{build_flags} -DSYSTEMD_INSTALL_DIR=%{_unitdir}

- %endif

- %if %{?_with_asan:1}%{!?_with_asan:0}

- %global build_flags %{build_flags} -DASAN=1

+ %setup -q

+ %if %{py_app_version} == 3

+ %patch0 -p1

  %endif

  

  %build

  ./src/plugins/apache-httpd/buildcurl.sh

  

- %if %{?_with_asan:1}%{!?_with_asan:0} && %{?rhel}%{!?rhel:0} >= 6

- #  . scl_source enable %{devtoolset} 2> /dev/null > /dev/null

-   . /opt/rh/%{devtoolset}/enable

- %endif

- 

+ %global build_flags -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON -DINSTALL_PFX_DOC=%{_pkgdocdir}

  %if %systemd

- %if %{?fedora}%{!?fedora:0} >= 28

-     %cmake3 . -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON -DSYSTEMD_INSTALL_DIR=%{_unitdir} -DBUILD_MEMCACHE=OFF

- %else

-     %cmake3 . -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON -DSYSTEMD_INSTALL_DIR=%{_unitdir} 

+ %global build_flags %{build_flags} -DSYSTEMD_INSTALL_DIR=%{_unitdir}

  %endif

- %else

- 	%cmake3 . -DCMAKE_INSTALL_PREFIX=/ -DRUN_ONLY_STANDALONE_TESTS=ON -DOVERWRITE_CONFIGFILES=ON

+ %if %{with asan}

+ %global build_flags %{build_flags} -DASAN=1

  %endif

  

- make %{?_smp_mflags}

- make doc

+ %cmake3 %{build_flags}

+ 

+ %cmake3_build

+ %cmake3_build -- doc

  

  %check

- pushd tests

- LD_LIBRARY_PATH=~+/../src/ ctest -V

+ pushd %{_vpath_builddir}/tests

+ LD_LIBRARY_PATH=~+/../src/ ctest3 -V

  if [ $? -ne 0 ]; then

      exit 1

  fi

  popd

  

  %install

- rm -rf %{buildroot}

- mkdir -p %{buildroot}%{_libdir}

+ %cmake3_install

  

- make install DESTDIR=%{buildroot}

  # clean up the startup scripts we don't need - otherwise rpmbuild will fail

  # due to unpackaged files

  %if %systemd
@@ -741,8 +677,8 @@ 

    rm -rf %{buildroot}/usr/lib/systemd

  %endif

  

- ## remote tests if not needed

- %if %{?dmlite_tests} == 0

+ ## remove tests if not needed

+ %if ! %{with dmlite_tests}

  rm -rf %{buildroot}/%{_libdir}/dmlite/test

  %endif

  
@@ -773,18 +709,18 @@ 

  tar zxvf src/puppet/lcgdm-voms-*.tar.gz  -C %{basefolder}/voms/ --strip-components 1

  

  ## for dpm-xrootd

- ln -s libXrdDPMFinder-4.so %{buildroot}%{_libdir}/libXrdDPMFinder.so-4.3

- ln -s libXrdDPMDiskAcc-4.so %{buildroot}%{_libdir}/libXrdDPMDiskAcc.so-4.3

- ln -s libXrdDPMOss-4.so %{buildroot}%{_libdir}/libXrdDPMOss.so-4.3

- ln -s libXrdDPMRedirAcc-4.so %{buildroot}%{_libdir}/libXrdDPMRedirAcc.so-4.3

- ln -s libXrdDPMStatInfo-4.so %{buildroot}%{_libdir}/libXrdDPMStatInfo.so-4.3

- ln -s libXrdDPMCks-4.so %{buildroot}%{_libdir}/libXrdDPMCks.so-4.3

+ ln -s libXrdDPMFinder-5.so %{buildroot}%{_libdir}/libXrdDPMFinder.so-5.3

+ ln -s libXrdDPMDiskAcc-5.so %{buildroot}%{_libdir}/libXrdDPMDiskAcc.so-5.3

+ ln -s libXrdDPMOss-5.so %{buildroot}%{_libdir}/libXrdDPMOss.so-5.3

+ ln -s libXrdDPMRedirAcc-5.so %{buildroot}%{_libdir}/libXrdDPMRedirAcc.so-5.3

+ ln -s libXrdDPMStatInfo-5.so %{buildroot}%{_libdir}/libXrdDPMStatInfo.so-5.3

+ ln -s libXrdDPMCks-5.so %{buildroot}%{_libdir}/libXrdDPMCks.so-5.3

  

  ## for dpm-dsi

  install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp

  

  %post libs

- /sbin/ldconfig

+ %{?ldconfig}

  /sbin/service rsyslog condrestart || true

  %if %systemd

          /bin/systemctl try-restart dpm.service || true
@@ -798,19 +734,10 @@ 

          /sbin/service dpm-gsiftp condrestart || true

  %endif

  

- 

- %postun libs 

- /sbin/ldconfig

+ %postun libs

+ %{?ldconfig}

  /sbin/service rsyslog condrestart || true

  

- %files dpmhead-domeonly

- %{_prefix}/share/dmlite/dbscripts

- %{_prefix}/share/dmlite/filepull

- %{_prefix}/share/dmlite/StAR-accounting

- 

- %files dpmdisk-domeonly

- %{_prefix}/share/dmlite/filepull

- 

  %files libs

  %dir %{_sysconfdir}/dmlite.conf.d

  %dir %{_libdir}/dmlite
@@ -837,40 +764,17 @@ 

  %files private-devel

  %{_includedir}/dmlite/cpp

  ## for dpm-xrootd

- %defattr(-,root,root) 

  %dir %{_includedir}/XrdDPM

  %{_includedir}/XrdDPM/XrdCompileVersion.hh

  

- 

- %files dpm-tester

- %{_bindir}/dpm-tester.py

- 

- 

  %files docs

  %{_mandir}/man3/*

- %{_defaultdocdir}/%{name}-%{version}

- 

- %if %{?fedora}%{!?fedora:0} >= 26

- %files -n python2-dmlite

- %else

- %files -n python-dmlite

- %endif

- %defattr(-,root,root,-)

- %{python2_sitearch}/pydmlite.so

- 

- %if %{?dmlite_tests}

- 

- %files test

- %{_libdir}/dmlite/test

- 

- %endif

+ %{_pkgdocdir}

  

  %files plugins-memcache

- %if %{?fedora}%{!?fedora:0} < 28

  %{_libdir}/dmlite/plugin_memcache.so

  %doc LICENSE README RELEASE-NOTES

  %config(noreplace) %{_sysconfdir}/dmlite.conf.d/zmemcache.conf

- %endif

  

  %files plugins-profiler

  %{_libdir}/dmlite/plugin_profiler.so
@@ -881,23 +785,6 @@ 

  %{_libdir}/dmlite/plugin_librarian.so

  %doc LICENSE README RELEASE-NOTES

  

- 

- %files shell

- %{_bindir}/dmlite-shell

- %{_bindir}/dpm-storage-summary.py

- %{_bindir}/dpm-storage-summary.cgi

- %{_bindir}/dmlite-mysql-dirspaces.py

- %{_bindir}/dome-info-provider.py

- %{_sharedstatedir}/bdii/gip/provider/dome-info-exec

- %config(noreplace) %{_sysconfdir}/sysconfig/dpminfo

- %if %{?rhel}%{!?rhel:99} <= 5

- %{_bindir}/dmlite-mysql-dirspaces.pyc

- %{_bindir}/dmlite-mysql-dirspaces.pyo

- %endif

- %{python2_sitelib}/dmliteshell

- %doc LICENSE README RELEASE-NOTES

- 

- 

  %files plugins-mysql

  %{_libdir}/dmlite/plugin_mysql.so

  %doc LICENSE README RELEASE-NOTES
@@ -912,9 +799,33 @@ 

  %{_prefix}/share/dmlite/puppet/modules

  

  %changelog

+ * Mon Nov 02 2020 Oliver Keeble <oliver.keeble@cern.ch> - 1.14.2-1

+ - New upstream release 1.14.2

+ 

+ * Thu Sep 24 2020 Oliver Keeble <oliver.keeble@cern.ch> - 1.14.1-1

+ - New upstream release 1.14.1

+ 

  * Tue Jul 28 2020 Oliver Keeble <oliver.keeble@cern.ch> - 1.14.0-3

  - New upstream release 1.14.0

  

+ * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.99-8

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

+ 

+ * Fri May 29 2020 Jonathan Wakely <jwakely@redhat.com> - 1.13.99-7

+ - Rebuilt for Boost 1.73

+ 

+ * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.13.99-6

+ - Rebuilt for Python 3.9

+ 

+ * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 1.13.99-5

+ - Rebuild (json-c)

+ 

+ * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.99-4

+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

+ 

+ * Tue Sep 24 2019 Miro Hrončok <mhroncok@redhat.com> - 1.13.99-2

+ - Require correct version of python-ldap and m2crypto

+ 

  * Mon Sep 23 2019 Oliver Keeble <oliver.keeble@cern.ch> - 1.13.2-2

  - New upstream release 1.13.2

  
@@ -1042,7 +953,6 @@ 

  - fix crash in dmlite-plugins-mysql

  - some fixes in dmlite-shell drain

  

- 

  * Mon Nov 02 2015  Andrea Manzi <amanzi@cern.ch> - 0.7.5-1

  - added xattr to Memcache plugin

  - fix for checksums store
@@ -1069,10 +979,11 @@ 

  * Fri Apr 25 2014 Alejandro Alvarez <aalvarez@cern.ch> - 0.6.2-2

  - Patched mistyped parenthesis in Security.cpp

  

- * Tue Mar 11 2014 Adrien Devresse <adevress at cern.ch> - 0.6.2-1 

+ * Tue Mar 11 2014 Adrien Devresse <adevress at cern.ch> - 0.6.2-1

  - dmlite release 0.6.2

  

- * Mon Dec 16 2013 Alejandro Alvarez <aalvarez@cern.ch> - 0.6.1-2

+ * Fri Nov 29 2013 Alejandro Alvarez <aalvarez@cern.ch> - 0.6.1-2

+ - Enabled Python bindings

  

  * Wed Jul 10 2013 Alejandro Alvarez <aalvarez@cern.ch> - 0.6.1-1

  - Update for new upstream release
@@ -1087,11 +998,14 @@ 

  - Update for new upstream release

  - Added patch to disable python and tests packages

  

+ * Wed Dec 19 2012 Ricardo Rocha <ricardo.rocha@cern.ch> - 0.6.0-1

+ - Update for new upstream release

+ 

  * Thu Oct 25 2012 Ricardo Rocha <ricardo.rocha@cern.ch> - 0.5.0-1

  - Update for new upstream release

  

  * Wed Oct 24 2012 Ricardo Rocha <ricardo.rocha@cern.ch> - 0.4.2-2

- - #869568 - dmlite-libs should own /usr/lib(64)/dmlite 

+ - Fedora #869568 - dmlite-libs should own /usr/lib(64)/dmlite

  

  * Mon Sep 24 2012 Ricardo Rocha <ricardo.rocha@cern.ch> - 0.4.2-1

  - update for new upstream release
@@ -1120,3 +1034,5 @@ 

  * Mon Jan 23 2012 Alejandro Alvarez <alejandro.alvarez.ayllon@cern.ch> - 0.1.0-1

  - Added cppunit-devel as a build dependency

  

+ * Fri Jan 20 2012 Alejandro Alvarez <alejandro.alvarez.ayllon@cern.ch> - 0.1.0-1

+ - Created spec file

file removed
-200
@@ -1,200 +0,0 @@ 

- Index: src/plugins/memcache/Memcache.h

- ===================================================================

- --- src/plugins/memcache/Memcache.h	(revision 11059)

- +++ src/plugins/memcache/Memcache.h	(working copy)

- @@ -4,7 +4,7 @@

-  #ifndef MEMCACHE_H

-  #define MEMCACHE_H

-  

- -#include <libmemcached/memcached.h>

- +#include "patched_memcached/memcached.h"

-  #include <dmlite/cpp/dmlite.h>

-  #include <dmlite/cpp/catalog.h>

-  #include <dmlite/cpp/poolmanager.h>

- Index: src/plugins/memcache/MemcacheCommon.h

- ===================================================================

- --- src/plugins/memcache/MemcacheCommon.h	(revision 11059)

- +++ src/plugins/memcache/MemcacheCommon.h	(working copy)

- @@ -8,7 +8,7 @@

-  #include <boost/thread/locks.hpp>

-  //#include <boost/thread/shared_mutex.hpp>

-  #include <sstream>

- -#include <libmemcached/memcached.h>

- +#include "patched_memcached/memcached.h"

-  

-  #include <dmlite/cpp/exceptions.h>

-  #include <dmlite/cpp/poolmanager.h>

- Index: src/plugins/memcache/patched_memcached/memcached.h

- ===================================================================

- --- src/plugins/memcache/patched_memcached/memcached.h	(revision 0)

- +++ src/plugins/memcache/patched_memcached/memcached.h	(working copy)

- @@ -0,0 +1,169 @@

- +/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:

- + * 

- + *  Libmemcached library

- + *

- + *  Copyright (C) 2011 Data Differential, http://datadifferential.com/

- + *  Copyright (C) 2006-2009 Brian Aker All rights reserved.

- + *

- + *  Redistribution and use in source and binary forms, with or without

- + *  modification, are permitted provided that the following conditions are

- + *  met:

- + *

- + *      * Redistributions of source code must retain the above copyright

- + *  notice, this list of conditions and the following disclaimer.

- + *

- + *      * Redistributions in binary form must reproduce the above

- + *  copyright notice, this list of conditions and the following disclaimer

- + *  in the documentation and/or other materials provided with the

- + *  distribution.

- + *

- + *      * The names of its contributors may not be used to endorse or

- + *  promote products derived from this software without specific prior

- + *  written permission.

- + *

- + *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- + *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

- + *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

- + *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

- + *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- + *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

- + *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- + *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- + *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- + *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- + *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- + *

- + */

- +

- +#pragma once

- +

- +/* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t  */

- +#ifndef __STDC_FORMAT_MACROS

- +#  define __STDC_FORMAT_MACROS

- +#endif

- +

- +#ifdef __cplusplus

- +#  include <tr1/cinttypes>

- +#  include <cstddef>

- +#  include <cstdlib>

- +#else

- +#  include <inttypes.h>

- +#  include <stddef.h>

- +#  include <stdlib.h>

- +#  include <stdbool.h>

- +#endif

- +

- +#include <sys/types.h>

- +

- +#include <libmemcached-1.0/visibility.h>

- +#include <libmemcached-1.0/configure.h>

- +#include <libmemcached-1.0/platform.h>

- +

- +#include <libmemcached-1.0/limits.h>

- +#include <libmemcached-1.0/defaults.h>

- +

- +#include <libmemcached-1.0/types/behavior.h>

- +#include <libmemcached-1.0/types/callback.h>

- +#include <libmemcached-1.0/types/connection.h>

- +#include <libmemcached-1.0/types/hash.h>

- +#include <libmemcached-1.0/types/return.h>

- +#include <libmemcached-1.0/types/server_distribution.h>

- +

- +#include <libmemcached-1.0/return.h>

- +

- +#include <libmemcached-1.0/types.h>

- +#include <libmemcached-1.0/callbacks.h>

- +#include <libmemcached-1.0/alloc.h>

- +#include <libmemcached-1.0/triggers.h>

- +

- +#include <libhashkit-1.0/hashkit.h>

- +

- +#include <libmemcached-1.0/struct/callback.h>

- +#include <libmemcached-1.0/struct/string.h>

- +#include <libmemcached-1.0/struct/result.h>

- +#include <libmemcached-1.0/struct/allocator.h>

- +#include <libmemcached-1.0/struct/sasl.h>

- +#include <libmemcached-1.0/struct/memcached.h>

- +#include <libmemcached-1.0/struct/server.h>

- +#include <libmemcached-1.0/struct/stat.h>

- +

- +#include <libmemcached-1.0/basic_string.h>

- +#include <libmemcached-1.0/error.h>

- +#include <libmemcached-1.0/stats.h>

- +

- +// Everything above this line must be in the order specified.

- +#include <libmemcached-1.0/allocators.h>

- +#include <libmemcached-1.0/analyze.h>

- +#include <libmemcached-1.0/auto.h>

- +#include <libmemcached-1.0/behavior.h>

- +#include <libmemcached-1.0/callback.h>

- +#include <libmemcached-1.0/delete.h>

- +#include <libmemcached-1.0/dump.h>

- +#include <libmemcached-1.0/encoding_key.h>

- +#include <libmemcached-1.0/exist.h>

- +#include <libmemcached-1.0/fetch.h>

- +#include <libmemcached-1.0/flush.h>

- +#include <libmemcached-1.0/flush_buffers.h>

- +#include <libmemcached-1.0/get.h>

- +#include <libmemcached-1.0/hash.h>

- +#include <libmemcached-1.0/options.h>

- +#include <libmemcached-1.0/parse.h>

- +#include <libmemcached-1.0/quit.h>

- +#include <libmemcached-1.0/result.h>

- +#include <libmemcached-1.0/server.h>

- +#include <libmemcached-1.0/server_list.h>

- +#include <libmemcached-1.0/storage.h>

- +#include <libmemcached-1.0/strerror.h>

- +#include <libmemcached-1.0/touch.h>

- +#include <libmemcached-1.0/verbosity.h>

- +#include <libmemcached-1.0/version.h>

- +#include <libmemcached-1.0/sasl.h>

- +

- +#include <libmemcached-1.0/deprecated_types.h>

- +

- +#ifdef __cplusplus

- +extern "C" {

- +#endif

- +

- +LIBMEMCACHED_API

- +void memcached_servers_reset(memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +memcached_st *memcached_create(memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +memcached_st *memcached(const char *string, size_t string_length);

- +

- +LIBMEMCACHED_API

- +void memcached_free(memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +memcached_return_t memcached_reset(memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +void memcached_reset_last_disconnected_server(memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +void *memcached_get_user_data(const memcached_st *ptr);

- +

- +LIBMEMCACHED_API

- +void *memcached_set_user_data(memcached_st *ptr, void *data);

- +

- +LIBMEMCACHED_API

- +memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source);

- +

- +LIBMEMCACHED_API

- +const memcached_instance_st * memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key);

- +

- +LIBMEMCACHED_API

- +uint32_t memcached_server_count(const memcached_st *);

- +

- +LIBMEMCACHED_API

- +uint64_t memcached_query_id(const memcached_st *);

- +

- +#ifdef __cplusplus

- +} // extern "C"

- +#endif

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (dmlite-1.14.0.tar.gz) = 344d478635623ff499c78574138d36ff36fc6e9e2f75709c6c39e3d0d767986ea92b8d61c93da7e57e19104fead4dbb5a1a5357b2e40a5f506f52327673c8859

+ SHA512 (dmlite-1.14.2.tar.gz) = 8765bd30c9c1c1b7b5fe0433642fc89eba848b8ee1e5122080d955c5efc854302784ebc107984112da908c591522a1c794cd3db9fe13debd7c45faab72b2b3e3

Hi!

The EPEL 7 branch is ahead of master. This pull request merges the EPEL 7 branch into master and cleans up the specfile.
The resulting specfile builds on Fedora Rawhide, Fedora 33, EPEL 7 and EPEL 8 (i.e. where there is xrootd 5).
After merging the pull request, master should be able to be cleanly merged to f33, epel8 and epel7 branches.

Pull-Request has been merged by andreamanzi

3 years ago

thanks a lot Mattias!
i will do the merge for the moment on F33 to fix some installation issue