The package rpms/lcgdm.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/lcgdm.git/commit/?id=797dc1e14084....
Change:
-%ifnarch %{ix86} ppc ppc64 s390 s390x sparc sparc64
Thanks.
Full change:
============
commit 866301d9e576df310bb088343788af2f815b02c4
Merge: 7930160 3db112f
Author: Oliver Keeble <oliver.keeble(a)cern.ch>
Date: Mon Mar 4 10:11:03 2019 +0100
Merge branch 'master' into f28
commit 3db112fe1b55942c3040ab3bee67c213c72b3f7d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 06:25:07 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/lcgdm.spec b/lcgdm.spec
index 10096fc..a63305c 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -21,7 +21,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: LHC Computing Grid Data Management
License: ASL 2.0
@@ -1575,6 +1575,9 @@ fi
%endif
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.10.0-16
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1.10.0-15
- Rebuilt for libcrypt.so.2 (#1666033)
commit 48ceaf33b9e4c0a13ce885ab2b4e0d3a36aa3dd9
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Mon Jan 14 19:06:11 2019 +0100
Rebuilt for libcrypt.so.2 (#1666033)
diff --git a/lcgdm.spec b/lcgdm.spec
index 6a26878..10096fc 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -21,7 +21,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: LHC Computing Grid Data Management
License: ASL 2.0
@@ -1575,6 +1575,9 @@ fi
%endif
%changelog
+* Mon Jan 14 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1.10.0-15
+- Rebuilt for libcrypt.so.2 (#1666033)
+
* Fri Jan 04 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1.10.0-14
- Add patch to use explicit python2 shebangs, fixes FTBFS for Fedora 30
- Link the c compiled python modules with proper LDFLAGS
commit cb8ae3236d552bed69a2b361c73923eb288a88af
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Fri Jan 4 11:57:27 2019 +0100
Link the c compiled python modules with proper LDFLAGS
diff --git a/lcgdm.spec b/lcgdm.spec
index 85efc2b..6a26878 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -542,7 +542,7 @@ gcc %{optflags} -fno-strict-aliasing -fPIC -D_LARGEFILE64_SOURCE
-Dlinux \
${INCLUDE_PYTHON} ../lfc-mysql/%{name}-%{version}/ns/${module}_wrap.c
gcc %{optflags} -fno-strict-aliasing -fPIC -D_LARGEFILE64_SOURCE -Dlinux \
-shared -o _${module}${PYTHON_MODULE_SUFFIX} ${module}_wrap.o ${PYTHON_LIB} \
- -L../lfc-mysql/%{name}-%{version}/shlib -llfc -llcgdm
+ %{?__global_ldflags} -L../lfc-mysql/%{name}-%{version}/shlib -llfc -llcgdm
done
@@ -554,7 +554,7 @@ gcc %{optflags} -fno-strict-aliasing -fPIC -D_LARGEFILE64_SOURCE
-Dlinux \
${INCLUDE_PYTHON} ../dpm-mysql/%{name}-%{version}/dpm/${module}_wrap.c
gcc %{optflags} -fno-strict-aliasing -fPIC -D_LARGEFILE64_SOURCE -Dlinux \
-shared -o _${module}${PYTHON_MODULE_SUFFIX} ${module}_wrap.o ${PYTHON_LIB} \
- -L../dpm-mysql/%{name}-%{version}/shlib -ldpm -llcgdm
+ %{?__global_ldflags} -L../dpm-mysql/%{name}-%{version}/shlib -ldpm -llcgdm
done
@@ -1577,6 +1577,7 @@ fi
%changelog
* Fri Jan 04 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1.10.0-14
- Add patch to use explicit python2 shebangs, fixes FTBFS for Fedora 30
+- Link the c compiled python modules with proper LDFLAGS
* Thu Aug 09 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1.10.0-13
- Use explicit --with-python=/usr/bin/python2 in configure (fixes rawhide)
commit 684e30614c544f6ccf8994d0a76ff6e51b5672ca
Author: Bjrn Esser <besser82(a)fedoraproject.org>
Date: Fri Jan 4 11:50:58 2019 +0100
Add patch to use explicit python2 shebangs, fixes FTBFS for Fedora 30
diff --git a/lcgdm-1.10.0-explicit-python2.patch b/lcgdm-1.10.0-explicit-python2.patch
new file mode 100644
index 0000000..d6394d4
--- /dev/null
+++ b/lcgdm-1.10.0-explicit-python2.patch
@@ -0,0 +1,10 @@
+Index: lcgdm-1.10.0/scripts/StAR-accounting/star-accounting.py
+===================================================================
+--- lcgdm-1.10.0.orig/scripts/StAR-accounting/star-accounting.py
++++ lcgdm-1.10.0/scripts/StAR-accounting/star-accounting.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+
+
+
diff --git a/lcgdm.spec b/lcgdm.spec
index 1e03dde..85efc2b 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -21,7 +21,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: LHC Computing Grid Data Management
License: ASL 2.0
@@ -34,6 +34,8 @@ Source1: %{name}-unitfiles.tar.gz
# Remove deprecated python function:
#
https://savannah.cern.ch/bugs/?69232
Patch0: %{name}-python-exception.patch
+# Use explicit python2 shebang.
+Patch1: %{name}-1.10.0-explicit-python2.patch
BuildRequires: imake
BuildRequires: globus-gssapi-gsi-devel
@@ -452,6 +454,7 @@ for d in lfc-mysql dpm-mysql ; do
pushd $d/%{name}-%{version}
%patch0 -p1
+%patch1 -p1
chmod 644 security/globus_gsi_gss_constants.h \
security/globus_i_gsi_credential.h \
@@ -1572,6 +1575,9 @@ fi
%endif
%changelog
+* Fri Jan 04 2019 Bjrn Esser <besser82(a)fedoraproject.org> - 1.10.0-14
+- Add patch to use explicit python2 shebangs, fixes FTBFS for Fedora 30
+
* Thu Aug 09 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1.10.0-13
- Use explicit --with-python=/usr/bin/python2 in configure (fixes rawhide)
- Remove redundant macro definitions for old Fedora and EPEL releases
commit 870dc6303c53b81bd859fbf920dff0f349446e5f
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Thu Nov 15 12:53:55 2018 +0100
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
diff --git a/lcgdm.spec b/lcgdm.spec
index 07d57a3..1e03dde 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -1,3 +1,7 @@
+# This package depends on automagic byte compilation
+#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+%global _python_bytecompile_extra 1
+
%if %{?rhel}%{!?rhel:0} == 6
%filter_provides_in %{perl_vendorarch}/.*\.so$
%filter_provides_in %{python2_sitearch}/.*\.so$
commit 7930160254d657b1cd88c9d3518a6b970dcb878d
Merge: 863ff16 797dc1e
Author: Oliver Keeble <oliver.keeble(a)cern.ch>
Date: Tue Oct 2 17:15:39 2018 +0200
Merge branch 'master' into f28
commit 797dc1e140847d96c886430451cc846ff16eb360
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Aug 9 22:46:06 2018 +0200
Use explicit --with-python=/usr/bin/python2 in configure (fixes rawhide)
Remove redundant macro definitions for old Fedora and EPEL releases
Only filter provides on EPEL 6 - the others filter correctly by default
Add python34-lfc and python34-dnf packages for EPEL 7
Remove obsolete Group tags
Fix more python subpackage names
Fix shebang in dpm-listspaces script
Use %license, %ldconfig_scriptlets and %systemd_requires
diff --git a/lcgdm-dpm-listspaces-dav.patch b/lcgdm-dpm-listspaces-dav.patch
deleted file mode 100644
index db622c5..0000000
--- a/lcgdm-dpm-listspaces-dav.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dpm/dpm-listspaces
-===================================================================
---- dpm/dpm-listspaces (revision 10742)
-+++ dpm/dpm-listspaces (revision 11102)
-@@ -802,7 +802,7 @@
- if params.enabled():
- self.control['srmv2'] = params
- # self.interface is for webdav/xroot
-- if webdav:
-+ if webdav and subprocess.Popen("grep -sF mod_lcgdm_dav.so /proc/`pgrep -ox -u
root httpd.event`/maps",shell=True,stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()[0]:
- params =
Interface(name='webdav',protocol="https",port=webdav,version=self.version,
semantics='http://tools.ietf.org/html/rfc4918')
- if params.enabled():
- self.access['webdav'] = {'protocol': 'https',
'port': webdav, 'version': self.version, 'security': 'GSI'
}
diff --git a/lcgdm.spec b/lcgdm.spec
index 6ca1b64..07d57a3 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -1,30 +1,6 @@
-%{!?perl_vendorarch: %global perl_vendorarch %(eval "`%{__perl}
-V:installvendorarch`"; echo $installvendorarch)}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; import sys;
sys.stdout.write(get_python_lib(1))")}
-
-%if %{?rhel}%{!?rhel:0} == 5
-%global _with_swig %(echo "--py-dontrunswig")
-%global altpython python26
-%global __altpython %{_bindir}/python2.6
-# Disable the default python byte compilation
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e
's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%endif
-
-%if %{?fedora}%{!?fedora:0} >= 13
-%global altpython python3
-%global __altpython %{_bindir}/python3
-%endif
-
-%if %{?altpython:1}%{!?altpython:0}
-%global altpython_sitearch %(%{__altpython} -c "from distutils.sysconfig import
get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")
-%endif
-
-%if %{?filter_setup:1}%{!?filter_setup:0}
-%filter_provides_in %{_libdir}/lcgdm/.*\.so$
+%if %{?rhel}%{!?rhel:0} == 6
%filter_provides_in %{perl_vendorarch}/.*\.so$
-%filter_provides_in %{python_sitearch}/.*\.so$
-%if %{?altpython:1}%{!?altpython:0}
-%filter_provides_in %{altpython_sitearch}/.*\.so$
-%endif
+%filter_provides_in %{python2_sitearch}/.*\.so$
%filter_setup
%endif
@@ -35,31 +11,26 @@
%endif
# by default, argus support should not be included
-%{!?_with_argus: %{!?without_argus: %define _without_argus --without-argus}}
+%{!?_with_argus: %{!?without_argus: %global _without_argus --without-argus}}
# make sure only one option is defined
%{?_with_argus: %{?_without_argus: %{error: both _with_argus and _without_argus}}}
Name: lcgdm
Version: 1.10.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: LHC Computing Grid Data Management
-Group: Applications/Internet
License: ASL 2.0
URL:
http://glite.web.cern.ch/glite/
-# LANG=C svn co
http://svn.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_11 lcgdm-1.8.11
-# tar --exclude .svn -z -c -f lcgdm-1.8.11.tar.gz lcgdm-1.8.11
+# LANG=C svn export
http://svn.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_10_0
lcgdm-1.10.0
+# tar -z -c -f lcgdm-1.10.0.tar.gz lcgdm-1.10.0
Source0: %{name}-%{version}.tar.gz
# Systemd unit files
Source1: %{name}-unitfiles.tar.gz
# Remove deprecated python function:
#
https://savannah.cern.ch/bugs/?69232
Patch0: %{name}-python-exception.patch
-# Check for mod_dav before publishing
-#
https://its.cern.ch/jira/browse/LCGDM-1576
-#Patch1: %%{name}-dpm-listspaces-dav.patch
-BuildRequires: gcc-c++
BuildRequires: imake
BuildRequires: globus-gssapi-gsi-devel
BuildRequires: globus-gss-assist-devel
@@ -74,9 +45,9 @@ BuildRequires: CGSI-gSOAP-devel >= 1.3.4.0
%if 0%{?fedora} >= 28
BuildRequires: mariadb-connector-c-devel
-BuildRequires: libnsl2-devel
+BuildRequires: libnsl2-devel
%else
-BuildRequires: mysql-devel
+BuildRequires: mysql-devel
%endif
BuildRequires: libuuid-devel
BuildRequires: swig
@@ -87,15 +58,19 @@ BuildRequires: perl
BuildRequires: perl-generators
%endif
BuildRequires: python2-devel
-%if %{?altpython:1}%{!?altpython:0}
-BuildRequires: %{altpython}-devel
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 8
+BuildRequires: python3-devel
+%endif
+%if %{?rhel}%{!?rhel:0} == 7
+BuildRequires: python34-devel
%endif
%if %systemd
-BuildRequires: systemd-units
+BuildRequires: systemd
%endif
BuildRequires: groff
BuildRequires: gcc
+BuildRequires: gcc-c++
# This cannot be executed in the case of pure EPEL builds
# as Argus is not available there
@@ -110,7 +85,6 @@ The lcgdm package provides the LCG Data Management components: the LFC
%package libs
Summary: LHC Computing Grid Data Management common libraries
-Group: System Environment/Libraries
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < 1.8.1.2-2
@@ -120,19 +94,7 @@ components: the LFC (LCG File Catalog) and the DPM (Disk Pool
Manager).
%package devel
Summary: LCG Data Management common development files
-Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%if 0%{?el5}
-%ifarch %{ix86}
-Provides: %{name}-devel(x86-32)
-%endif
-%ifnarch %{ix86} ppc ppc64 s390 s390x sparc sparc64
-# why doesn't ifarch x86_64 work?
-Provides: %{name}-devel(x86-64)
-%endif
-%else
-Provides: %{name}-devel%{?_isa}
-%endif
%description devel
This package contains common development libraries and header files
@@ -140,7 +102,6 @@ for LCG Data Management.
%package -n lfc-libs
Summary: LCG File Catalog (LFC) libraries
-Group: System Environment/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: lfc < 1.8.1.2-2
@@ -151,7 +112,6 @@ This package contains the run time LFC client library.
%package -n lfc-devel
Summary: LFC development libraries and header files
-Group: Development/Libraries
Requires: lfc-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
@@ -162,7 +122,6 @@ This package contains the development libraries and header files for
LFC.
%package -n lfc
Summary: LCG File Catalog (LFC) client
-Group: Applications/Internet
Requires: lfc-libs%{?_isa} = %{version}-%{release}
Provides: lfc-client = %{version}-%{release}
Obsoletes: lfc-client < 1.8.1.2-2
@@ -174,7 +133,6 @@ This package contains the command line interfaces for the LFC.
%package -n lfc-perl
Summary: LCG File Catalog (LFC) perl bindings
-Group: Applications/Internet
Provides: perl-lfc = %{version}-%{release}
Obsoletes: perl-lfc <= 1.8.2
Requires: lfc-libs%{?_isa} = %{version}-%{release}
@@ -186,8 +144,7 @@ replicas of the logical files in a distributed storage system.
This package provides Perl bindings for the LFC client library.
%package -n python2-lfc
-Summary: LCG File Catalog (LFC) python bindings
-Group: Applications/Internet
+Summary: LCG File Catalog (LFC) python 2 bindings
Provides: lfc-python = %{version}-%{release}
Obsoletes: lfc-python < 1.10.0-8
Requires: lfc-libs%{?_isa} = %{version}-%{release}
@@ -196,28 +153,25 @@ Requires: lfc-libs%{?_isa} = %{version}-%{release}
%description -n python2-lfc
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
-This package provides Python bindings for the LFC client library.
-
-%if %{?altpython:1}%{!?altpython:0}
-%package -n %{altpython}-lfc
-Summary: LCG File Catalog (LFC) python bindings
-Group: Applications/Internet
-Provides: lfc-%{altpython} = %{version}-%{release}
-Obsoletes: lfc-%{altpython} < 1.10.0-8
-Requires: lfc-libs%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide %{altpython}-lfc}
+This package provides Python 2 bindings for the LFC client library.
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%package -n python%{python3_pkgversion}-lfc
+Summary: LCG File Catalog (LFC) python 3 bindings
+Provides: lfc-python%{python3_pkgversion} = %{version}-%{release}
+Obsoletes: lfc-python%{python3_pkgversion} < 1.10.0-8
+Requires: lfc-libs%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-lfc}
-%description -n %{altpython}-lfc
+%description -n python%{python3_pkgversion}-lfc
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
-This package provides Python bindings for the LFC client library.
+This package provides Python 3 bindings for the LFC client library.
%endif
%package -n lfc-server-mysql
Summary: LCG File Catalog (LFC) server with MySQL database back-end
-Group: Applications/Internet
-Requires: finger%{?_isa}
+Requires: finger
Provides: lfcdaemon = %{version}-%{release}
Requires: lfc-libs%{?_isa} = %{version}-%{release}
Provides: lfc-mysql = %{version}-%{release}
@@ -228,9 +182,7 @@ Obsoletes: LFC-server-mysql <= 1.8.2
Requires(pre): shadow-utils
Requires(post): mysql
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -246,15 +198,12 @@ back-end.
%package -n lfc-dli
Summary: LCG File Catalog (LFC) data location interface (dli) server
-Group: Applications/Internet
Requires: lfcdaemon = %{version}-%{release}
Requires(pre): shadow-utils
-Requires(post): finger
+Requires(post): finger
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -269,7 +218,6 @@ This package provides the data location interface (dli) server for the
LFC.
%package -n dpm-libs
Summary: Disk Pool Manager (DPM) libraries
-Group: System Environment/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: dpm < 1.8.1.2-2
@@ -281,7 +229,6 @@ This package contains the run time DPM client library.
%package -n dpm-devel
Summary: DPM development libraries and header files
-Group: Development/Libraries
Requires: dpm-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
@@ -293,7 +240,6 @@ This package contains the development libraries and header files for
DPM.
%package -n dpm
Summary: Disk Pool Manager (DPM) client
-Group: Applications/Internet
Requires: dpm-libs%{?_isa} = %{version}-%{release}
Provides: dpm-client = %{version}-%{release}
Obsoletes: dpm-client < 1.8.1.2-2
@@ -306,7 +252,6 @@ This package contains the command line interfaces for the DPM.
%package -n dpm-perl
Summary: Disk Pool Manager (DPM) perl bindings
-Group: Applications/Internet
Provides: perl-dpm = %{version}-%{release}
Obsoletes: perl-dpm <= 1.8.2
Requires: dpm-libs%{?_isa} = %{version}-%{release}
@@ -318,44 +263,38 @@ of disks. It provides several interfaces for storing and retrieving
data such as HTTP, gridftp and xroot.
This package provides Perl bindings for the DPM client library.
-%package -n dpm-python
-Summary: Disk Pool Manager (DPM) python bindings
-Group: Applications/Internet
-Provides: python-dpm = %{version}-%{release}
-Obsoletes: python-dpm <= 1.8.2
+%package -n python2-dpm
+Summary: Disk Pool Manager (DPM) python 2 bindings
+Provides: dpm-python = %{version}-%{release}
+Obsoletes: dpm-python < 1.10.0-13
Requires: dpm-libs%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-dpm}
-%description -n dpm-python
+%description -n python2-dpm
The LCG Disk Pool Manager (DPM) creates a storage element from a set
of disks. It provides several interfaces for storing and retrieving
data such as HTTP, gridftp and xroot.
-This package provides Python bindings for the DPM client library.
+This package provides Python 2 bindings for the DPM client library.
-%if %{?altpython:1}%{!?altpython:0}
-%package -n dpm-%{altpython}
-Summary: Disk Pool Manager (DPM) python bindings
-Group: Applications/Internet
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%package -n python%{python3_pkgversion}-dpm
+Summary: Disk Pool Manager (DPM) python 3 bindings
+Provides: dpm-python%{python3_pkgversion} = %{version}-%{release}
+Obsoletes: dpm-python%{python3_pkgversion} < 1.10.0-13
Requires: dpm-libs%{?_isa} = %{version}-%{release}
-%if %{?rhel}%{!?rhel:0} == 5
-Requires: python(abi) = 2.6
-%endif
-%if %{altpython} == python26
-Provides: python26-dpm
-Obsoletes: python26-dpm
-%endif
+%{?python_provide:%python_provide python%{python3_pkgversion}-dpm}
-%description -n dpm-%{altpython}
+%description -n python%{python3_pkgversion}-dpm
The LCG Disk Pool Manager (DPM) creates a storage element from a set
of disks. It provides several interfaces for storing and retrieving
data such as HTTP, gridftp and xroot.
-This package provides Python bindings for the DPM client library.
+This package provides Python 3 bindings for the DPM client library.
%endif
%package -n dpm-server-mysql
Summary: Disk Pool Manager (DPM) server with MySQL database back-end
-Group: Applications/Internet
Requires: dpm-libs%{?_isa} = %{version}-%{release}
-Requires: finger%{?_isa}
+Requires: finger
Requires: MySQL-python
Requires: python-lxml
Provides: dpm-mysql = %{version}-%{release}
@@ -365,9 +304,7 @@ Obsoletes: DPM-server-mysql <= 1.8.2
Requires(pre): shadow-utils
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -384,8 +321,7 @@ back-end.
%package -n dpm-name-server-mysql
Summary: DPM name server with MySQL database back-end
-Group: Applications/Internet
-Requires: finger%{?_isa}
+Requires: finger
Requires: dpm-libs%{?_isa} = %{version}-%{release}
Provides: dpm-mysql-nameserver = %{version}-%{release}
Obsoletes: dpm-mysql-nameserver < 1.8.1.2-2
@@ -395,9 +331,7 @@ Obsoletes: DPM-name-server-mysql <= 1.8.2
Requires(pre): shadow-utils
Requires(post): mysql
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -414,8 +348,7 @@ back-end.
%package -n dpm-copy-server-mysql
Summary: DPM copy server with MySQL database back-end
-Group: Applications/Internet
-Requires: finger%{?_isa}
+Requires: finger
Requires: dpm-libs%{?_isa} = %{version}-%{release}
Provides: dpm-mysql-copyd = %{version}-%{release}
Obsoletes: dpm-mysql-copyd < 1.8.1.2-2
@@ -424,9 +357,7 @@ Obsoletes: DPM-copy-server-mysql <= 1.8.2
Requires(pre): shadow-utils
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -443,8 +374,7 @@ database back-end.
%package -n dpm-srm-server-mysql
Summary: DPM SRM server with MySQL database back-end
-Group: Applications/Internet
-Requires: finger%{?_isa}
+Requires: finger
Requires: dpm-libs%{?_isa} = %{version}-%{release}
Provides: dpm-mysql-srmv1 = %{version}-%{release}
Obsoletes: dpm-mysql-srmv1 < 1.8.1.2-2
@@ -457,9 +387,7 @@ Obsoletes: DPM-srm-server-mysql <= 1.8.2
Requires(pre): shadow-utils
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -476,8 +404,7 @@ database back-end.
%package -n dpm-rfio-server
Summary: DPM RFIO server
-Group: Applications/Internet
-Requires: finger%{?_isa}
+Requires: finger
Requires: dpm-libs%{?_isa} = %{version}-%{release}
Provides: dpm-rfiod = %{version}-%{release}
Obsoletes: dpm-rfiod < 1.8.1.2-2
@@ -485,9 +412,7 @@ Provides: DPM-rfio-server = %{version}-%{release}
Obsoletes: DPM-rfio-server <= 1.8.2
%if %systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
%else
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -501,6 +426,16 @@ of disks. It provides several interfaces for storing and retrieving
data such as HTTP, gridftp and xroot.
This package provides a Remote File IO (RFIO) server for DPM.
+%if %{?_with_argus:1}%{!?_with_argus:0}
+%package -n dpm-argus
+Summary: DPM Argus support
+Requires: dpm-mysql-nameserver = %{version}-%{release}
+Provides: dpm-argus = %{version}-%{release}
+
+%description -n dpm-argus
+Argus support for the Disk Pool Manager (DPM).
+%endif
+
%prep
%setup -T -q -c
%setup -q -c -n %{name}-%{version}/lfc-mysql
@@ -513,7 +448,6 @@ for d in lfc-mysql dpm-mysql ; do
pushd $d/%{name}-%{version}
%patch0 -p1
-#%patch1 -p0
chmod 644 security/globus_gsi_gss_constants.h \
security/globus_i_gsi_credential.h \
@@ -530,24 +464,14 @@ popd
done
-%if %{?_with_argus:1}%{!?_with_argus:0}
-%package -n dpm-argus
-Summary: DPM Argus support
-Group: Applications/Internet
-Requires: dpm-mysql-nameserver = %{version}-%{release}
-Provides: dpm-argus = %{version}-%{release}
-
-%description -n dpm-argus
-Argus support for the Disk Pool Manager (DPM).
-%endif
-
%build
-gsoapversion=`soapcpp2 -v 2>&1 | grep C++ | sed 's/.* //'`
+gsoapversion=`soapcpp2 -v 2>&1 </dev/null | grep C++ | sed 's/.* //'`
pushd lfc-mysql/%{name}-%{version}
-./configure lfc %{?_with_swig} \
+./configure lfc \
%{?_without_argus} \
+ --with-python=%{__python2} \
--with-mysql \
--libdir=%{_lib} \
--with-gsoap-version=$gsoapversion \
@@ -566,6 +490,7 @@ pushd dpm-mysql/%{name}-%{version}
./configure dpm \
%{?_without_argus} \
+ --with-python=%{__python2} \
--with-mysql \
--libdir=%{_lib} \
--with-gsoap-version=$gsoapversion \
@@ -581,15 +506,15 @@ make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags
gsoap`"
popd
-%if %{?altpython:1}%{!?altpython:0}
-mkdir %{altpython}
-pushd %{altpython}
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+mkdir python3
+pushd python3
-INCLUDE_PYTHON=`%{__altpython} \
+INCLUDE_PYTHON=`%{__python3} \
-c "from distutils import sysconfig; \
import sys; \
sys.stdout.write('-I' + sysconfig.get_python_inc(0))"`
-PYTHON_LIB=`%{__altpython} \
+PYTHON_LIB=`%{__python3} \
-c "from distutils import sysconfig; \
import sys; \
sys.stdout.write('-L' + sysconfig.get_config_var('LIBDEST') + \
@@ -598,7 +523,7 @@ PYTHON_LIB=`%{__altpython} \
+ ' ' + \
sysconfig.get_config_var('LIBS') + ' ' + \
sysconfig.get_config_var('SYSLIBS'))"`
-PYTHON_MODULE_SUFFIX=`%{__altpython} \
+PYTHON_MODULE_SUFFIX=`%{__python3} \
-c "from distutils import sysconfig; \
print(sysconfig.get_config_var('SO'))"`
@@ -630,8 +555,6 @@ popd
%endif
%install
-rm -rf ${RPM_BUILD_ROOT}
-
%if %systemd
mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
%endif
@@ -759,15 +682,15 @@ for svc in srmv1 srmv2 srmv2.2 ; do
${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
touch ${RPM_BUILD_ROOT}%{_unitdir}/${svc}.service
%else
- touch ${RPM_BUILD_ROOT}%{_initrddir}/${svc}
- chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/${svc}
- touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/${svc}
+ touch ${RPM_BUILD_ROOT}%{_initrddir}/${svc}
+ chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/${svc}
+ touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/${svc}
%endif
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/${svc}
-touch ${RPM_BUILD_ROOT}%{_sbindir}/${svc}
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/${svc}
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/${svc}.8
+ touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/${svc}
+ touch ${RPM_BUILD_ROOT}%{_sbindir}/${svc}
+ chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/${svc}
+ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/${svc}.8
done
# dpm-rfiod unit file / startup script
@@ -787,21 +710,12 @@ popd
# remove the log man page (already exists in the system and not needed anyway)
rm ${RPM_BUILD_ROOT}%{_mandir}/man3/log.3*
-%if %{?altpython:1}%{!?altpython:0}
-mkdir -p ${RPM_BUILD_ROOT}%{altpython_sitearch}
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}
install -m 644 lfc-mysql/%{name}-%{version}/ns/*.py \
dpm-mysql/%{name}-%{version}/dpm/*.py \
- ${RPM_BUILD_ROOT}%{altpython_sitearch}
-install %{altpython}/*.so ${RPM_BUILD_ROOT}%{altpython_sitearch}
-%endif
-
-%if %{?fedora}%{!?fedora:0} < 5 && %{?rhel}%{!?rhel:0} < 6
-%{__python} -c 'import compileall;
compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10,
"%{python_sitearch}", 1)' > /dev/null
-%{__python} -O -c 'import compileall;
compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10,
"%{python_sitearch}", 1)' > /dev/null
-%if %{?altpython:1}%{!?altpython:0}
-%{__altpython} -c 'import compileall;
compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'",
10, "%{altpython_sitearch}", 1)' > /dev/null
-%{__altpython} -O -c 'import compileall;
compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'",
10, "%{altpython_sitearch}", 1)' > /dev/null
-%endif
+ ${RPM_BUILD_ROOT}%{python3_sitearch}
+install python3/*.so ${RPM_BUILD_ROOT}%{python3_sitearch}
%endif
# Add the upgrade scripts
@@ -818,17 +732,18 @@ install -m 755
lfc-mysql/%{name}-%{version}/scripts/StAR-accounting/star-account
mkdir ${RPM_BUILD_ROOT}%{_libexecdir}
install -m 755 lfc-mysql/%{name}-%{version}/scripts/lcg-info-provider-lfc
${RPM_BUILD_ROOT}%{_libexecdir}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%post -n lfc-libs -p /sbin/ldconfig
-
-%postun -n lfc-libs -p /sbin/ldconfig
-
-%post -n dpm-libs -p /sbin/ldconfig
+# Fix shebang in dpm-listspaces script
+%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
+sed 's!/usr/bin/env python!%{__python3}!' \
+ -i ${RPM_BUILD_ROOT}%{_bindir}/dpm-listspaces
+%else
+sed 's!/usr/bin/env python!%{__python2}!' \
+ -i ${RPM_BUILD_ROOT}%{_bindir}/dpm-listspaces
+%endif
-%postun -n dpm-libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets -n lfc-libs
+%ldconfig_scriptlets -n dpm-libs
%pre -n lfc-server-mysql
getent group lfcmgr > /dev/null || groupadd -r lfcmgr
@@ -1359,7 +1274,7 @@ fi
%{_libdir}/libCsec_plugin_ID.so
%dir %{_datadir}/lcgdm/upgrades
%{_datadir}/lcgdm/upgrades/Common.pm
-%doc lfc-mysql/%{name}-%{version}/README lfc-mysql/%{name}-%{version}/LICENSE
+%license lfc-mysql/%{name}-%{version}/README lfc-mysql/%{name}-%{version}/LICENSE
%files devel
%{_libdir}/liblcgdm.so
@@ -1400,21 +1315,25 @@ fi
%{python2_sitearch}/lfc2.py*
%{python2_sitearch}/_lfc2thr.so
%{python2_sitearch}/lfc2thr.py*
+%if ! ( %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8 )
%doc %{_mandir}/man3/lfc_python.3*
%doc %{_mandir}/man3/lfc2_python.3*
+%endif
-%if %{?altpython:1}%{!?altpython:0}
-%files -n %{altpython}-lfc
-%{altpython_sitearch}/_lfc.*so
-%{altpython_sitearch}/lfc.py*
-%{altpython_sitearch}/_lfcthr.*so
-%{altpython_sitearch}/lfcthr.py*
-%{altpython_sitearch}/_lfc2.*so
-%{altpython_sitearch}/lfc2.py*
-%{altpython_sitearch}/_lfc2thr.*so
-%{altpython_sitearch}/lfc2thr.py*
-%if %{?fedora}%{!?fedora:0} >= 15
-%{altpython_sitearch}/__pycache__/lfc*
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%files -n python%{python3_pkgversion}-lfc
+%{python3_sitearch}/_lfc.*so
+%{python3_sitearch}/lfc.py*
+%{python3_sitearch}/_lfcthr.*so
+%{python3_sitearch}/lfcthr.py
+%{python3_sitearch}/_lfc2.*so
+%{python3_sitearch}/lfc2.py*
+%{python3_sitearch}/_lfc2thr.*so
+%{python3_sitearch}/lfc2thr.py
+%{python3_sitearch}/__pycache__/lfc*
+%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
+%doc %{_mandir}/man3/lfc_python.3*
+%doc %{_mandir}/man3/lfc2_python.3*
%endif
%endif
@@ -1486,31 +1405,31 @@ fi
%{perl_vendorarch}/dpm.so
%{perl_vendorarch}/dpm.pm
-%files -n dpm-python
-%if %{?fedora}%{!?fedora:0} < 26
+%files -n python2-dpm
+%if ! ( %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8 )
%{_bindir}/dpm-listspaces
%doc %{_mandir}/man1/dpm-listspaces.1*
+%doc %{_mandir}/man3/dpm_python.3*
+%doc %{_mandir}/man3/dpm2_python.3*
%endif
%{python2_sitearch}/_dpm.so
%{python2_sitearch}/dpm.py*
%{python2_sitearch}/_dpm2.so
%{python2_sitearch}/dpm2.py*
-%doc %{_mandir}/man3/dpm_python.3*
-%doc %{_mandir}/man3/dpm2_python.3*
-%if %{?altpython:1}%{!?altpython:0}
-%files -n dpm-%{altpython}
-%if %{?fedora}%{!?fedora:0} >= 26
+%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
+%files -n python%{python3_pkgversion}-dpm
+%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
%{_bindir}/dpm-listspaces
%doc %{_mandir}/man1/dpm-listspaces.1*
+%doc %{_mandir}/man3/dpm_python.3*
+%doc %{_mandir}/man3/dpm2_python.3*
%endif
-%{altpython_sitearch}/_dpm.*so
-%{altpython_sitearch}/dpm.py*
-%{altpython_sitearch}/_dpm2.*so
-%{altpython_sitearch}/dpm2.py*
-%if %{?fedora}%{!?fedora:0} >= 15
-%{altpython_sitearch}/__pycache__/dpm*
-%endif
+%{python3_sitearch}/_dpm.*so
+%{python3_sitearch}/dpm.py*
+%{python3_sitearch}/_dpm2.*so
+%{python3_sitearch}/dpm2.py
+%{python3_sitearch}/__pycache__/dpm*
%endif
%files -n dpm-server-mysql
@@ -1649,6 +1568,16 @@ fi
%endif
%changelog
+* Thu Aug 09 2018 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1.10.0-13
+- Use explicit --with-python=/usr/bin/python2 in configure (fixes rawhide)
+- Remove redundant macro definitions for old Fedora and EPEL releases
+- Only filter provides on EPEL 6 - the others filter correctly by default
+- Add python34-lfc and python34-dnf packages for EPEL 7
+- Remove obsolete Group tags
+- Fix more python subpackage names
+- Fix shebang in dpm-listspaces script
+- Use %%license, %%ldconfig_scriptlets and %%systemd_requires
+
* Mon Jul 16 2018 Miro Hronok <mhroncok(a)redhat.com> - 1.10.0-12
- Fix python subpackage names
commit 7b53cd1a1aeda33eac833fe9920c8545c9e0cf1e
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jul 30 00:28:01 2018 +0200
python-devel python2-devel
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/lcgdm.spec b/lcgdm.spec
index ebdfe96..6ca1b64 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -86,7 +86,7 @@ BuildRequires: perl-devel
BuildRequires: perl
BuildRequires: perl-generators
%endif
-BuildRequires: python-devel
+BuildRequires: python2-devel
%if %{?altpython:1}%{!?altpython:0}
BuildRequires: %{altpython}-devel
%endif
commit 4916e1d87ba1d7b49307743026fbca077425c329
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jul 30 00:22:19 2018 +0200
%{python_sitearch} %{python2_sitearch}
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/lcgdm.spec b/lcgdm.spec
index 342701e..ebdfe96 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -1392,14 +1392,14 @@ fi
%doc %{_mandir}/man3/lfc_perl.3*
%files -n python2-lfc
-%{python_sitearch}/_lfc.so
-%{python_sitearch}/lfc.py*
-%{python_sitearch}/_lfcthr.so
-%{python_sitearch}/lfcthr.py*
-%{python_sitearch}/_lfc2.so
-%{python_sitearch}/lfc2.py*
-%{python_sitearch}/_lfc2thr.so
-%{python_sitearch}/lfc2thr.py*
+%{python2_sitearch}/_lfc.so
+%{python2_sitearch}/lfc.py*
+%{python2_sitearch}/_lfcthr.so
+%{python2_sitearch}/lfcthr.py*
+%{python2_sitearch}/_lfc2.so
+%{python2_sitearch}/lfc2.py*
+%{python2_sitearch}/_lfc2thr.so
+%{python2_sitearch}/lfc2thr.py*
%doc %{_mandir}/man3/lfc_python.3*
%doc %{_mandir}/man3/lfc2_python.3*
@@ -1491,10 +1491,10 @@ fi
%{_bindir}/dpm-listspaces
%doc %{_mandir}/man1/dpm-listspaces.1*
%endif
-%{python_sitearch}/_dpm.so
-%{python_sitearch}/dpm.py*
-%{python_sitearch}/_dpm2.so
-%{python_sitearch}/dpm2.py*
+%{python2_sitearch}/_dpm.so
+%{python2_sitearch}/dpm.py*
+%{python2_sitearch}/_dpm2.so
+%{python2_sitearch}/dpm2.py*
%doc %{_mandir}/man3/dpm_python.3*
%doc %{_mandir}/man3/dpm2_python.3*
commit 1c067369e36b471e9da8b4043c2c95f12daff828
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jul 24 15:24:39 2018 +0200
simplify conditions
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/lcgdm.spec b/lcgdm.spec
index 5ea9e25..342701e 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -59,15 +59,8 @@ Patch0: %{name}-python-exception.patch
#
https://its.cern.ch/jira/browse/LCGDM-1576
#Patch1: %%{name}-dpm-listspaces-dav.patch
-%if %{?rhel}%{!?rhel:0} == 5
BuildRequires: gcc-c++
-BuildRequires: buildsys-macros
-%endif
-%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
BuildRequires: imake
-%else
-BuildRequires: xorg-x11-devel
-%endif
BuildRequires: globus-gssapi-gsi-devel
BuildRequires: globus-gss-assist-devel
BuildRequires: globus-gsi-credential-devel
@@ -79,19 +72,15 @@ BuildRequires: voms-devel
BuildRequires: gsoap-devel
BuildRequires: CGSI-gSOAP-devel >= 1.3.4.0
-%if %{?fedora}%{!?fedora:0} >= 28
+%if 0%{?fedora} >= 28
BuildRequires: mariadb-connector-c-devel
BuildRequires: libnsl2-devel
%else
BuildRequires: mysql-devel
%endif
-%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
BuildRequires: libuuid-devel
-%else
-BuildRequires: e2fsprogs-devel
-%endif
BuildRequires: swig
-%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 6
+%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: perl-devel
%else
BuildRequires: perl
commit 410cccd380c9fd5e415c9fd8f2dd47372e8f9526
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Thu Jun 14 13:37:36 2018 +0200
Fix python subpackage names
diff --git a/lcgdm.spec b/lcgdm.spec
index 40cddfa..5ea9e25 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: LHC Computing Grid Data Management
Group: Applications/Internet
@@ -196,32 +196,30 @@ The LCG File Catalog (LFC) keeps track of the locations of the
physical
replicas of the logical files in a distributed storage system.
This package provides Perl bindings for the LFC client library.
-%package -n lfc-python
+%package -n python2-lfc
Summary: LCG File Catalog (LFC) python bindings
Group: Applications/Internet
-Provides: python-lfc = %{version}-%{release}
-Obsoletes: python-lfc <= 1.8.2
+Provides: lfc-python = %{version}-%{release}
+Obsoletes: lfc-python < 1.10.0-8
Requires: lfc-libs%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python2-lfc}
-%description -n lfc-python
+%description -n python2-lfc
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package provides Python bindings for the LFC client library.
%if %{?altpython:1}%{!?altpython:0}
-%package -n lfc-%{altpython}
+%package -n %{altpython}-lfc
Summary: LCG File Catalog (LFC) python bindings
Group: Applications/Internet
+Provides: lfc-%{altpython} = %{version}-%{release}
+Obsoletes: lfc-%{altpython} < 1.10.0-8
Requires: lfc-libs%{?_isa} = %{version}-%{release}
-%if %{?rhel}%{!?rhel:0} == 5
-Requires: python(abi) = 2.6
-%endif
-%if %{altpython} == python26
-Provides: python26-lfc
-Obsoletes: python26-lfc
-%endif
+%{?python_provide:%python_provide %{altpython}-lfc}
+
-%description -n lfc-%{altpython}
+%description -n %{altpython}-lfc
The LCG File Catalog (LFC) keeps track of the locations of the physical
replicas of the logical files in a distributed storage system.
This package provides Python bindings for the LFC client library.
@@ -1404,7 +1402,7 @@ fi
%{perl_vendorarch}/lfc.pm
%doc %{_mandir}/man3/lfc_perl.3*
-%files -n lfc-python
+%files -n python2-lfc
%{python_sitearch}/_lfc.so
%{python_sitearch}/lfc.py*
%{python_sitearch}/_lfcthr.so
@@ -1417,7 +1415,7 @@ fi
%doc %{_mandir}/man3/lfc2_python.3*
%if %{?altpython:1}%{!?altpython:0}
-%files -n lfc-%{altpython}
+%files -n %{altpython}-lfc
%{altpython_sitearch}/_lfc.*so
%{altpython_sitearch}/lfc.py*
%{altpython_sitearch}/_lfcthr.*so
@@ -1662,6 +1660,9 @@ fi
%endif
%changelog
+* Mon Jul 16 2018 Miro Hronok <mhroncok(a)redhat.com> - 1.10.0-12
+- Fix python subpackage names
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.10.0-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 126c98275284ba26016285cadddbb3e96ef6b53f
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Thu Jul 19 20:56:42 2018 +0200
add BuildRequires: gcc-c++
Reference:
https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
diff --git a/lcgdm.spec b/lcgdm.spec
index 620c3b4..40cddfa 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -60,6 +60,7 @@ Patch0: %{name}-python-exception.patch
#Patch1: %%{name}-dpm-listspaces-dav.patch
%if %{?rhel}%{!?rhel:0} == 5
+BuildRequires: gcc-c++
BuildRequires: buildsys-macros
%endif
%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
commit d7a6e2ba91affe0906b9e04b245031b15c4e1248
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 07:37:56 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/lcgdm.spec b/lcgdm.spec
index d66340b..620c3b4 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: LHC Computing Grid Data Management
Group: Applications/Internet
@@ -1661,6 +1661,9 @@ fi
%endif
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.10.0-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Jul 03 2018 Petr Pisar <ppisar(a)redhat.com> - 1.10.0-10
- Perl 5.28 rebuild
commit 0591ae78ab553b3e2528f829ef2d0864b31a7cc7
Author: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Tue Jul 10 01:34:53 2018 -0500
Remove needless use of %defattr
diff --git a/lcgdm.spec b/lcgdm.spec
index 69c3052..d66340b 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -1366,7 +1366,6 @@ if [ $1 -ge 1 ]; then
fi
%files libs
-%defattr(-,root,root,-)
%{_libdir}/liblcgdm.so.*
%{_libdir}/libCsec_plugin_GSI.so
%{_libdir}/libCsec_plugin_ID.so
@@ -1375,7 +1374,6 @@ fi
%doc lfc-mysql/%{name}-%{version}/README lfc-mysql/%{name}-%{version}/LICENSE
%files devel
-%defattr(-,root,root,-)
%{_libdir}/liblcgdm.so
%doc %{_mandir}/man3/C*.3*
%doc %{_mandir}/man3/getconfent.3*
@@ -1386,11 +1384,9 @@ fi
%doc %{_mandir}/man4/Castor_limits.4*
%files -n lfc-libs
-%defattr(-,root,root,-)
%{_libdir}/liblfc.so.*
%files -n lfc-devel
-%defattr(-,root,root,-)
%{_includedir}/lfc
%{_libdir}/liblfc.so
%doc %{_mandir}/man3/lfc_[a-o]*.3*
@@ -1398,19 +1394,16 @@ fi
%doc %{_mandir}/man3/lfc_[q-z]*.3*
%files -n lfc
-%defattr(-,root,root,-)
%{_bindir}/lfc-*
%doc %{_mandir}/man1/lfc-*
%{_libexecdir}/lcg-info-provider-lfc
%files -n lfc-perl
-%defattr(-,root,root,-)
%{perl_vendorarch}/lfc.so
%{perl_vendorarch}/lfc.pm
%doc %{_mandir}/man3/lfc_perl.3*
%files -n lfc-python
-%defattr(-,root,root,-)
%{python_sitearch}/_lfc.so
%{python_sitearch}/lfc.py*
%{python_sitearch}/_lfcthr.so
@@ -1424,7 +1417,6 @@ fi
%if %{?altpython:1}%{!?altpython:0}
%files -n lfc-%{altpython}
-%defattr(-,root,root,-)
%{altpython_sitearch}/_lfc.*so
%{altpython_sitearch}/lfc.py*
%{altpython_sitearch}/_lfcthr.*so
@@ -1439,7 +1431,6 @@ fi
%endif
%files -n lfc-server-mysql
-%defattr(-,root,root,-)
%dir %{_libdir}/lfc-mysql
%{_libdir}/lfc-mysql/lfcdaemon
%ghost %{_sbindir}/lfcdaemon
@@ -1468,7 +1459,6 @@ fi
%{_datadir}/lcgdm/upgrades/cns-db-*
%files -n lfc-dli
-%defattr(-,root,root,-)
%{_sbindir}/lfc-dli
%doc %{_mandir}/man8/lfc-dli.8*
%if %systemd
@@ -1480,11 +1470,9 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/lfc-dli
%files -n dpm-libs
-%defattr(-,root,root,-)
%{_libdir}/libdpm.so.*
%files -n dpm-devel
-%defattr(-,root,root,-)
%{_includedir}/dpm
%{_libdir}/libdpm.so
%doc %{_mandir}/man3/dpm_[a-o]*.3*
@@ -1497,7 +1485,6 @@ fi
%doc %{_mandir}/man3/rfio*.3*
%files -n dpm
-%defattr(-,root,root,-)
%{_bindir}/dpm-[a-k]*
%{_bindir}/dpm-[m-z]*
%{_bindir}/dpns-*
@@ -1508,12 +1495,10 @@ fi
%doc %{_mandir}/man1/rf*
%files -n dpm-perl
-%defattr(-,root,root,-)
%{perl_vendorarch}/dpm.so
%{perl_vendorarch}/dpm.pm
%files -n dpm-python
-%defattr(-,root,root,-)
%if %{?fedora}%{!?fedora:0} < 26
%{_bindir}/dpm-listspaces
%doc %{_mandir}/man1/dpm-listspaces.1*
@@ -1527,7 +1512,6 @@ fi
%if %{?altpython:1}%{!?altpython:0}
%files -n dpm-%{altpython}
-%defattr(-,root,root,-)
%if %{?fedora}%{!?fedora:0} >= 26
%{_bindir}/dpm-listspaces
%doc %{_mandir}/man1/dpm-listspaces.1*
@@ -1542,7 +1526,6 @@ fi
%endif
%files -n dpm-server-mysql
-%defattr(-,root,root,-)
%dir %{_libdir}/dpm-mysql
%{_libdir}/dpm-mysql/dpm
%ghost %{_sbindir}/dpm
@@ -1576,7 +1559,6 @@ fi
%{_datadir}/lcgdm/scripts/*
%files -n dpm-name-server-mysql
-%defattr(-,root,root,-)
%{_libdir}/dpm-mysql/dpnsdaemon
%ghost %{_sbindir}/dpnsdaemon
%{_libdir}/dpm-mysql/dpns-shutdown
@@ -1603,7 +1585,6 @@ fi
%{_datadir}/lcgdm/upgrades/cns-db-*
%files -n dpm-copy-server-mysql
-%defattr(-,root,root,-)
%{_libdir}/dpm-mysql/dpmcopyd
%ghost %{_sbindir}/dpmcopyd
%doc %{_libdir}/dpm-mysql/dpmcopyd.8*
@@ -1622,7 +1603,6 @@ fi
%ghost %{_sysconfdir}/logrotate.d/dpmcopyd
%files -n dpm-srm-server-mysql
-%defattr(-,root,root,-)
%{_libdir}/dpm-mysql/srmv1
%{_libdir}/dpm-mysql/srmv2
%{_libdir}/dpm-mysql/srmv2.2
@@ -1665,7 +1645,6 @@ fi
%ghost %{_sysconfdir}/logrotate.d/srmv2.2
%files -n dpm-rfio-server
-%defattr(-,root,root,-)
%{_sbindir}/rfiod
%if %systemd
%{_unitdir}/rfiod.service
@@ -1678,7 +1657,6 @@ fi
%if %{?_with_argus:1}%{!?_with_argus:0}
%files -n dpm-argus
-%defattr(-,root,root,-)
%{_bindir}/dpns-arguspoll
%endif
commit 6a1f3a26ff251d7f63b7e039db794467c699359d
Author: Petr Psa <ppisar(a)redhat.com>
Date: Tue Jul 3 12:15:31 2018 +0200
Perl 5.28 rebuild
diff --git a/lcgdm.spec b/lcgdm.spec
index ec272fd..69c3052 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: LHC Computing Grid Data Management
Group: Applications/Internet
@@ -1683,6 +1683,9 @@ fi
%endif
%changelog
+* Tue Jul 03 2018 Petr Pisar <ppisar(a)redhat.com> - 1.10.0-10
+- Perl 5.28 rebuild
+
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.10.0-9
- Perl 5.28 rebuild
commit fa5640e613496b187181c7b43cef163039ead87e
Author: Jitka Plesnikova <jplesnik(a)redhat.com>
Date: Wed Jun 27 22:33:59 2018 +0200
Perl 5.28 rebuild
diff --git a/lcgdm.spec b/lcgdm.spec
index 14d3ec2..ec272fd 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: LHC Computing Grid Data Management
Group: Applications/Internet
@@ -1683,6 +1683,9 @@ fi
%endif
%changelog
+* Wed Jun 27 2018 Jitka Plesnikova <jplesnik(a)redhat.com> - 1.10.0-9
+- Perl 5.28 rebuild
+
* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 1.10.0-8
- Rebuilt for Python 3.7
commit 27284b8b16f3058269dd9cdee3d95523662cf373
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Jun 19 10:45:42 2018 +0200
Rebuilt for Python 3.7
diff --git a/lcgdm.spec b/lcgdm.spec
index 814ba13..14d3ec2 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
Name: lcgdm
Version: 1.10.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: LHC Computing Grid Data Management
Group: Applications/Internet
@@ -1683,6 +1683,9 @@ fi
%endif
%changelog
+* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 1.10.0-8
+- Rebuilt for Python 3.7
+
* Fri Mar 16 2018 Oliver Keeble <oliver.keeble(a)cern.ch> - 1.10.0-7
- Python fix Bug 1436812