Adding requirements on major version of XRootD (software-4137) #3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| Name: xrootd-cmstfc | ||
| 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) | ||
|
|
||
| %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: pcre-devel | ||
|
|
||
| BuildRequires: xerces-c-devel | ||
|
|
||
| BuildRequires: cmake | ||
| #BuildRequires: xrootd-compat-libs | ||
|
|
||
| Requires: /usr/bin/xrootd pcre xerces-c | ||
| #Requires: xrootd-compat-libs | ||
ddavila0 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| #%if 0%{?rhel} < 7 | ||
| #Requires: xrootd4 >= 1:4.1.0 | ||
| #%else | ||
ddavila0 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Requires: xrootd >= 1:%{xrootd_current_major}.0.0-0 | ||
ddavila0 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Requires: xrootd < 1:%{xrootd_next_major}.0.0-0 | ||
| #%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 | ||
| cd %{name}-%{version} | ||
| %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=%{_lib} . | ||
|
There was a problem hiding this comment. Why are these lines necessary? There was a problem hiding this comment. Not sure, this changes were in the osg svn repo for god knows how long and there is no mention of them in the changelog There was a problem hiding this comment. I managed to get rid of the |
||
| 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 <[email protected]> - 1.5.2-6 | ||
| - Adding requirements on major version of XRootD (SOFTWARE-4137) | ||
|
|
||
| * Mon Apr 13 2020 Diego Davila <[email protected]> - 1.5.2-5 | ||
| - Rebuild against xrootd 5.0.0-rc2 (SOFTWARE-3923) | ||
|
|
||
| * Thu Jul 18 2019 Carl Edquist <[email protected]> - 1.5.2-4 | ||
| - Rebuild against xrootd 4.10.0 (SOFTWARE-3697) | ||
|
|
||
| * Wed Apr 24 2019 Carl Edquist <[email protected]> - 1.5.2-3 | ||
| - Rebuild against xrootd 4.9.1 (SOFTWARE-3678) | ||
|
|
||
| * Wed Feb 27 2019 Carl Edquist <[email protected]> - 1.5.2-2 | ||
| - Rebuild against xrootd 4.9.0 (SOFTWARE-3485) | ||
|
|
||
| * Wed Sep 05 2018 Edgar Fajardo <[email protected]> 1.5.2-1 | ||
| - Small change to reduce the logging verbosity of this plugin for the DPM team. | ||
|
|
||
| * Tue Aug 08 2017 Brian Lin <[email protected]> 1.5.1-11%{?dist} | ||
| - Build libraries into the appropriate shared lib arch path | ||
|
|
||
| * Mon Feb 23 2015 Edgar Fajardo <[email protected]> 1.5.1-10%{?dist} | ||
| - Require xrootd (instead of xrootd4) for all builds | ||
|
|
||
| * Fri Dec 05 2014 Mátyás Selmeci <[email protected]> 1.5.1-9%{?dist} | ||
| - Require xrootd (instead of xrootd4) on EL7 | ||
|
|
||
| * Mon Jul 14 2014 Edgar Fakardo <[email protected]> - 1.5.1-8 | ||
| - Rebuild against xrootd4 and fixed xrootd4 requirements | ||
|
|
||
| * Thu Apr 18 2013 Matyas Selmeci <[email protected]> - 1.5.1-6 | ||
| - Require and BuildRequire xrootd 3.3.1 explicitly | ||
|
|
||
| * Wed Apr 03 2013 Matyas Selmeci <[email protected]> - 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 <[email protected]> - 1.5.1-3 | ||
| - Move module back into base RPM. | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we allow this to be overridden via an RPM macro specified at build time?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure how this would play with osg-build, could we leave that for the next time?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be sufficient (assuming this looks right to @matyasselmeci)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought that the idea was to be able to set the version number at build time
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think what @brianhlin wrote will work. I'm not sure what you mean by "RPM macro specified at build time".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This gets us halfway there: if someone wants to build this outside of an OSG build environment, they'll have to specify
xrootd_current_major. @matyasselmeci is there a way to specifyxrootd_current_majoras an argument toosg-build?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Passing arbitrary --define options to rpmbuild and mock commands is doable but not currently implemented. You can currently work around it by defining those in your
~/.rpmmacrosfile.Passing --defines to Koji builds is impossible.
I strongly caution against depending on users to define specific macros via the command line, since it harms reproducibility -- you have to remember what arguments you passed to rpmbuild. If you want to change something, edit the spec file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would just be nice to specify a single spec file that can support builds against XRootD 4 and XRootD 5. This will have to do, though.