1:08 a.m.
commit 719d4e626d63899b7166aa43ad9ee67efcee4987
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Aug 24 02:08:43 2019 +0100
Use pull request instead
add-fedpkg-base-to-rfpkg-minimal.patch | 68 +++++++++++++++++++++++-----------
rfpkg-minimal.spec | 12 ++++--
2 files changed, 54 insertions(+), 26 deletions(-)
---
diff --git a/add-fedpkg-base-to-rfpkg-minimal.patch
b/add-fedpkg-base-to-rfpkg-minimal.patch
index 7bf7628..24753d2 100644
--- a/add-fedpkg-base-to-rfpkg-minimal.patch
+++ b/add-fedpkg-base-to-rfpkg-minimal.patch
@@ -1,26 +1,39 @@
-From 5de09953819053aee8879b29223da82836557a12 Mon Sep 17 00:00:00 2001
+From 39c5ac88f3eadfdd044d1f5a023d7ac0601658c6 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux(a)googlemail.com>
-Date: Sat, 24 Aug 2019 01:08:16 +0100
-Subject: [PATCH] add fedpkg-base to rfpkg-minimal
+Date: Sat, 24 Aug 2019 01:57:49 +0100
+Subject: [PATCH] Add un-released fedpkg-base
---
- bin/rfpkg-minimal | 31 ++++++++++++++++++++++++++++---
- 1 file changed, 28 insertions(+), 3 deletions(-)
+ bin/rfpkg-base | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ bin/rfpkg-minimal | 4 +---
+ 2 files changed, 47 insertions(+), 3 deletions(-)
+ create mode 100644 bin/rfpkg-base
-diff --git a/bin/rfpkg-minimal b/bin/rfpkg-minimal
-index 4697a71..a8083c1 100755
---- a/bin/rfpkg-minimal
-+++ b/bin/rfpkg-minimal
-@@ -20,8 +20,33 @@
- # Abort on errors
- set -e
-
--#url=$(git remote get-url origin)
--#url=$(git remote -v |grep origin | head -1 | awk '{print $2}')
- url=$(cat .git/config |awk '/url/ {print $3}')
- namespace=$(echo ${url} | awk -F '/' '{print $(NF-1)}')
--baseurl=https://pkgs.rpmfusion.org/repo/pkgs/${namespace} fedpkg-base $@
-+baseurl=https://pkgs.rpmfusion.org/repo/pkgs/${namespace}
+diff --git a/bin/rfpkg-base b/bin/rfpkg-base
+new file mode 100644
+index 0000000..87d90e8
+--- /dev/null
++++ b/bin/rfpkg-base
+@@ -0,0 +1,46 @@
++#!/bin/bash
++# Copyright (C) 2013 Red Hat, Inc.
++# Copyright (C) 2015 Till Maas
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>;.
++
++# Abort on errors
++set -e
+
+pkgname=$(basename "$PWD")
+if [[ -s sources ]]; then
@@ -48,6 +61,17 @@ index 4697a71..a8083c1 100755
+ md5sum -c sources
+ fi
+fi
---
-2.21.0
-
+diff --git a/bin/rfpkg-minimal b/bin/rfpkg-minimal
+index 4697a71..102906b 100755
+--- a/bin/rfpkg-minimal
++++ b/bin/rfpkg-minimal
+@@ -20,8 +20,6 @@
+ # Abort on errors
+ set -e
+
+-#url=$(git remote get-url origin)
+-#url=$(git remote -v |grep origin | head -1 | awk '{print $2}')
+ url=$(cat .git/config |awk '/url/ {print $3}')
+ namespace=$(echo ${url} | awk -F '/' '{print $(NF-1)}')
+-baseurl=https://pkgs.rpmfusion.org/repo/pkgs/${namespace} fedpkg-base $@
++baseurl=https://pkgs.rpmfusion.org/repo/pkgs/${namespace} rfpkg-base $@
diff --git a/rfpkg-minimal.spec b/rfpkg-minimal.spec
index c7bbb9f..75fe049 100644
--- a/rfpkg-minimal.spec
+++ b/rfpkg-minimal.spec
@@ -1,6 +1,6 @@
Name: rfpkg-minimal
Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Fork of fedpkg-minimal for RPM Fusion
# Licensing is unclear; LICENSE is the GPLv2 but bin/fedpkg (upstream)
@@ -9,14 +9,13 @@ Summary: Fork of fedpkg-minimal for RPM Fusion
License: GPLv2
URL: https://github.com/rpmfusion-infra/rfpkg-minimal
-Source0: %{url}/archive/%{version}.tar.gz#/rfpkg-minimal-%{version}.tar.gz
-Patch0: add-fedpkg-base-to-rfpkg-minimal.patch
+Source0: %{url}/archive/%{version}/rfpkg-minimal-%{version}.tar.gz
+Patch0: %{url}/pull/2.patch#/add-fedpkg-base-to-rfpkg-minimal.patch
BuildArch: noarch
# The script needs curl, just like fedpkg-minimal.
# It also needs coreutils (cut) and sed. Not sure if this must be listed.
-Requires: fedpkg-minimal > 1.1
Requires: coreutils
Requires: curl
Requires: sed
@@ -34,14 +33,19 @@ fedpkg-minimal.
%install
mkdir -p %{buildroot}%{_bindir}
+install -pm 755 bin/rfpkg-base %{buildroot}%{_bindir}/rfpkg-base
install -pm 755 bin/rfpkg-minimal %{buildroot}%{_bindir}/rfpkg-minimal
%files
+%{_bindir}/rfpkg-base
%{_bindir}/rfpkg-minimal
%doc README.md AUTHORS.md
%license LICENSE
%changelog
+* Sat Aug 24 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.4.1-3
+- Use pull request instead
+
* Sat Aug 24 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.4.1-2
- Combine fedpkg-base to match fedpkg-minimal