From 7ffa1e87e23eba936276969a877388b808f86b8a Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 26 Jun 2020 10:53:40 -0700 Subject: [PATCH 1/7] Adding requirements on major version of XRootD (software-4137) --- spec/xrootd-cmstfc.spec | 68 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index c57b814..3b2558f 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -1,7 +1,6 @@ - Name: xrootd-cmstfc -Version: 1.5.1 -Release: 3%{?dist} +Version: 1.5.2 +Release: 6%{?dist} Summary: CMS TFC plugin for xrootd Group: System Environment/Daemons @@ -11,9 +10,28 @@ URL: https://github.com/bbockelm/xrootd-cmstfc # git-archive master | gzip -7 > ~/rpmbuild/SOURCES/xrootd-lcmaps.tar.gz Source0: %{name}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: xrootd-libs-devel xerces-c-devel pcre-devel + +%define xrootd_current_major 4 +%define xrootd_next_major 5 + +BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-1 +BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-1 +BuildRequires: pcre-devel + +BuildRequires: xerces-c-devel + BuildRequires: cmake +#BuildRequires: xrootd-compat-libs + Requires: /usr/bin/xrootd pcre xerces-c +#Requires: xrootd-compat-libs + +#%if 0%{?rhel} < 7 +#Requires: xrootd4 >= 1:4.1.0 +#%else +Requires: xrootd >= 1:%{xrootd_current_major}.0.0-1 +Requires: xrootd < 1:%{xrootd_next_major}.0.0-1 +#%endif %package devel Summary: Development headers and libraries for Xrootd CMSTFC plugin @@ -29,12 +47,13 @@ Group: System Environment/Development %setup -q -c -n %{name}-%{version} %build - -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . +cd %{name}-%{version} +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=%{_lib} . make VERBOSE=1 %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +cd %{name}-%{version} make install DESTDIR=$RPM_BUILD_ROOT %clean @@ -50,6 +69,43 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/XrdCmsTfc.hh %changelog +* Fri Jun 26 2020 Diego Davila - 1.5.2-6 +- Adding requirements on major version of XRootD (SOFTWARE-4137) + +* Mon Apr 13 2020 Diego Davila - 1.5.2-5 +- Rebuild against xrootd 5.0.0-rc2 (SOFTWARE-3923) + +* Thu Jul 18 2019 Carl Edquist - 1.5.2-4 +- Rebuild against xrootd 4.10.0 (SOFTWARE-3697) + +* Wed Apr 24 2019 Carl Edquist - 1.5.2-3 +- Rebuild against xrootd 4.9.1 (SOFTWARE-3678) + +* Wed Feb 27 2019 Carl Edquist - 1.5.2-2 +- Rebuild against xrootd 4.9.0 (SOFTWARE-3485) + +* Wed Sep 05 2018 Edgar Fajardo 1.5.2-1 +- Small change to reduce the logging verbosity of this plugin for the DPM team. + +* Tue Aug 08 2017 Brian Lin 1.5.1-11%{?dist} +- Build libraries into the appropriate shared lib arch path + +* Mon Feb 23 2015 Edgar Fajardo 1.5.1-10%{?dist} +- Require xrootd (instead of xrootd4) for all builds + +* Fri Dec 05 2014 Mátyás Selmeci 1.5.1-9%{?dist} +- Require xrootd (instead of xrootd4) on EL7 + +* Mon Jul 14 2014 Edgar Fakardo - 1.5.1-8 +- Rebuild against xrootd4 and fixed xrootd4 requirements + +* Thu Apr 18 2013 Matyas Selmeci - 1.5.1-6 +- Require and BuildRequire xrootd 3.3.1 explicitly + +* Wed Apr 03 2013 Matyas Selmeci - 1.5.1-4 +- Bump to rebuild against xrootd 3.3.1 +- Rename xrootd-libs-devel dependency to match what 3.3.1 calls it + * Thu Nov 29 2012 Brian Bockelman - 1.5.1-3 - Move module back into base RPM. From f1e7382b2c7efd318946c6d39d8b50480a042a43 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 26 Jun 2020 11:22:17 -0700 Subject: [PATCH 2/7] changing release requirement -1 by -0 --- spec/xrootd-cmstfc.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index 3b2558f..30b08b7 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -14,8 +14,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %define xrootd_current_major 4 %define xrootd_next_major 5 -BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-1 -BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-1 +BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-0 +BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-0 BuildRequires: pcre-devel BuildRequires: xerces-c-devel @@ -29,8 +29,8 @@ Requires: /usr/bin/xrootd pcre xerces-c #%if 0%{?rhel} < 7 #Requires: xrootd4 >= 1:4.1.0 #%else -Requires: xrootd >= 1:%{xrootd_current_major}.0.0-1 -Requires: xrootd < 1:%{xrootd_next_major}.0.0-1 +Requires: xrootd >= 1:%{xrootd_current_major}.0.0-0 +Requires: xrootd < 1:%{xrootd_next_major}.0.0-0 #%endif %package devel From 4a8d807d2556a0117c3e787051237ecc9dca24dd Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Thu, 9 Jul 2020 14:16:44 -0700 Subject: [PATCH 3/7] removing commented lines --- spec/xrootd-cmstfc.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index 30b08b7..94d0144 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -17,14 +17,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-0 BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-0 BuildRequires: pcre-devel - BuildRequires: xerces-c-devel - BuildRequires: cmake -#BuildRequires: xrootd-compat-libs Requires: /usr/bin/xrootd pcre xerces-c -#Requires: xrootd-compat-libs #%if 0%{?rhel} < 7 #Requires: xrootd4 >= 1:4.1.0 From f6461e3030cb20c17b5f67c9c045c113533dbac2 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Thu, 9 Jul 2020 14:17:51 -0700 Subject: [PATCH 4/7] allowing RCs of next version to work with current version --- spec/xrootd-cmstfc.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index 94d0144..4b17193 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -14,8 +14,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %define xrootd_current_major 4 %define xrootd_next_major 5 -BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-0 -BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-0 +BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-1 +BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-1 BuildRequires: pcre-devel BuildRequires: xerces-c-devel BuildRequires: cmake @@ -25,8 +25,8 @@ Requires: /usr/bin/xrootd pcre xerces-c #%if 0%{?rhel} < 7 #Requires: xrootd4 >= 1:4.1.0 #%else -Requires: xrootd >= 1:%{xrootd_current_major}.0.0-0 -Requires: xrootd < 1:%{xrootd_next_major}.0.0-0 +Requires: xrootd >= 1:%{xrootd_current_major}.0.0-1 +Requires: xrootd < 1:%{xrootd_next_major}.0.0-1 #%endif %package devel From 30a475a19c09d7b75994b3eb20325823150f934c Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Tue, 14 Jul 2020 17:23:09 -0500 Subject: [PATCH 5/7] adding xrootd_current_minor to the equation --- spec/xrootd-cmstfc.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index 4b17193..ca4b085 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -12,10 +12,11 @@ Source0: %{name}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %define xrootd_current_major 4 +%define xrootd_current_minor 12 %define xrootd_next_major 5 -BuildRequires: xrootd-devel >= 1:%{xrootd_current_major}.0.0-1 -BuildRequires: xrootd-devel < 1:%{xrootd_next_major}.0.0-1 +BuildRequires: xrootd-devel >= 1:%{xrootd_current_major} +BuildRequires: xrootd-devel < 1:%{xrootd_next_major} BuildRequires: pcre-devel BuildRequires: xerces-c-devel BuildRequires: cmake @@ -25,7 +26,7 @@ Requires: /usr/bin/xrootd pcre xerces-c #%if 0%{?rhel} < 7 #Requires: xrootd4 >= 1:4.1.0 #%else -Requires: xrootd >= 1:%{xrootd_current_major}.0.0-1 +Requires: xrootd >= 1:%{xrootd_current_major}.%{xrootd_current_minor} Requires: xrootd < 1:%{xrootd_next_major}.0.0-1 #%endif From 3c19d9d7c6ad44574090f6688384345486bd2a45 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Tue, 14 Jul 2020 17:44:53 -0500 Subject: [PATCH 6/7] removing unecessary cd --- spec/xrootd-cmstfc.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index ca4b085..5519e3a 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -41,16 +41,14 @@ Group: System Environment/Development %{summary} %prep -%setup -q -c -n %{name}-%{version} +%setup -q %build -cd %{name}-%{version} %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=%{_lib} . make VERBOSE=1 %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -cd %{name}-%{version} make install DESTDIR=$RPM_BUILD_ROOT %clean From 213be626839f638cbb12006e936707986f3d2cae Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Wed, 29 Jul 2020 16:43:56 -0500 Subject: [PATCH 7/7] removing commented code --- spec/xrootd-cmstfc.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/xrootd-cmstfc.spec b/spec/xrootd-cmstfc.spec index 5519e3a..2efb515 100644 --- a/spec/xrootd-cmstfc.spec +++ b/spec/xrootd-cmstfc.spec @@ -23,12 +23,8 @@ BuildRequires: cmake Requires: /usr/bin/xrootd pcre xerces-c -#%if 0%{?rhel} < 7 -#Requires: xrootd4 >= 1:4.1.0 -#%else Requires: xrootd >= 1:%{xrootd_current_major}.%{xrootd_current_minor} Requires: xrootd < 1:%{xrootd_next_major}.0.0-1 -#%endif %package devel Summary: Development headers and libraries for Xrootd CMSTFC plugin