Changeset 1518 for spec/trunk/SPECS

Timestamp:

Nov 11, 2018, 3:19:36 PM (7 years ago)

Author:

Silvan Scherrer

Message:

spec: os2-rpm: Release version 1-4.

Location:

spec/trunk/SPECS

Files:

• os2-rpm.spec (modified) (4 diffs)
• os2-rpm/macros.scm (modified) (1 diff)

spec/trunk/SPECS/os2-rpm.spec

@@ -2 +2 @@
 Name: os2-rpm
 Version: 1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/System
@@ -29 +29 @@
 Source8: getbootdrive.cmd
 Source9: wpi4rpm.cmd
+Source10: macros.scm_pwd
 
 # This is necessary due to a silly "Provides: os2-rpm" in os2-rpm-build-0-1
@@ -71 +72 @@
 %{__install} -p -m 644 -t %{buildroot}%{_rpmconfigdir_macros_d} \
   macros.scm macros.cfg macros.wps
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/rpm
+%{__install} -p -m 644 -t %{buildroot}%{_sysconfdir}/rpm macros.scm_pwd
 
 # install OS/2 Rexx scripts
@@ -95 +98 @@
 %{_rpmconfigdir_os2}/find-legacy-runtime.sh
 %{_rpmconfigdir_macros_d}/macros.scm
+%config(noreplace) %{_sysconfdir}/rpm/macros.scm_pwd
 
 %changelog
+* Sun Nov 11 2018 Silvan Scherrer <silvan.scherrer@aroa.ch> 1-4
+- add the possibility to have password protected github projects
+
 * Mon Aug 20 2018 Silvan Scherrer <silvan.scherrer@aroa.ch> 1-3
 - copy wpi4rpm also to %{_bindir} ticket #308

spec/trunk/SPECS/os2-rpm/macros.scm

@@ -74 +74 @@
 %setup -n "%__source_dir_github" -Tc\
 rm -f "%SOURCE0"\
-wget -nv "%{__source_url}/archive/%{__source_rev}.zip" -O "%SOURCE0"\
+%global __github_user %{?github_user:--user=%{github_user}}%{?!github_user:}\
+%global __github_password %{?github_password:--password=%{github_password}}%{?!github_password:}\
+%global __github_token %{?github_token:--header="Authorization: token %{github_token}"}%{?!github_token:}\
+wget -nv %__github_user %__github_password %__github_token "%{__source_url}/archive/%{__source_rev}.zip" -O "%SOURCE0"\
 (cd .. && unzip -qq "%SOURCE0" "%__source_dir_github"/RPMBUILD_SOURCE 2>/dev/null) || :\
 %__scm_pre_pack\