Skip to content

Commit 51fc23c

Browse files
committed
More updates of the spec file from feedback
1 parent dec05b8 commit 51fc23c

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,13 @@ and copy the generated token. Then, from the build directory:
4242
Replace the given token above with the fresh one you just generated; using the above token should give an expired
4343
token error.
4444

45+
46+
Instructions for Generating a Release
47+
-------------------------------------
48+
49+
SciTokens-cpp includes a submodule, jwt-cpp. Therefore, to create a release, you have to include the submodule into the release.
50+
51+
git archive --prefix "scitokens-cpp-0.3.3/" -o "scitokens-cpp-0.3.3.tar" v0.3.3
52+
git submodule update --init
53+
git submodule foreach --recursive "git archive --prefix=scitokens-cpp-0.3.3/\$path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/scitokens-cpp-0.3.3.tar \$sha1.tar && rm \$sha1.tar"
54+
gzip "scitokens-cpp-0.3.3.tar"

rpm/scitokens-cpp.spec

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Name: scitokens-cpp
22
Version: 0.3.3
3-
Release: 2%{?dist}
3+
Release: 3%{?dist}
44
Summary: C++ Implementation of the SciTokens Library
5-
License: Apache 2.0
5+
License: ASL 2.0
66
URL: https://github.com/scitokens/scitokens-cpp
77

8-
# Generated from:
8+
# Directions to generate a proper release:
99
# git archive --prefix "scitokens-cpp-0.3.3/" -o "scitokens-cpp-0.3.3.tar" v0.3.3
1010
# git submodule update --init
1111
# git submodule foreach --recursive "git archive --prefix=scitokens-cpp-0.3.3/\$path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/scitokens-cpp-0.3.3.tar \$sha1.tar && rm \$sha1.tar"
1212
# gzip "scitokens-cpp-0.3.3.tar"
13-
Source0: https://github.com/scitokens/%{name}/archive/%{name}-%{version}.tar.gz
13+
Source0: https://github.com/scitokens/scitokens-cpp/releases/download/v%{version}/%{name}-%{version}.tar.gz
1414

1515
# Scitokens-cpp bundles jwt-cpp, a header only dependency
1616
# Since it doesn't create a library that can be used by others, it seems
@@ -36,7 +36,7 @@ BuildRequires: scl-utils
3636
%package devel
3737
Summary: Header files for the scitokens-cpp public interfaces.
3838

39-
Requires: %{name} = %{version}
39+
Requires: %{name}%{?_isa} = %{version}
4040

4141
%description devel
4242
%{summary}
@@ -60,24 +60,29 @@ do_build
6060
%endif
6161

6262
%install
63-
pushd build
64-
%make_build install DESTDIR=$RPM_BUILD_ROOT
65-
popd
63+
%make_install -C build
64+
65+
# Run the ldconfig
66+
# This package is targeted to EPEL 7, which doesn't have the macro %ldconfig_scriplits
67+
# %ldconfig_scriptlets
6668

6769
%post
6870
/sbin/ldconfig
6971

7072
%postun
7173
/sbin/ldconfig
7274

75+
7376
%files
74-
%{_libdir}/libSciTokens.so*
77+
%{_libdir}/libSciTokens.so
78+
%{_libdir}/libSciTokens.so.0
79+
%{_libdir}/libSciTokens.so.0.0.2
80+
%license LICENSE
81+
%doc README.md
7582

7683
%files devel
7784
%{_includedir}/scitokens/scitokens.h
7885

79-
%defattr(-,root,root,-)
80-
8186
%changelog
8287
* Tue Jul 30 2019 Derek Weitzel <dweitzel@unl.edu> - 0.3.3-2
8388
- Change the Source URL

0 commit comments

Comments
 (0)