aboutsummaryrefslogtreecommitdiff
path: root/libssh2/stackrpms-libssh2.spec.diff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-10-23 22:36:30 -0400
committerB Stack <bgstack15@gmail.com>2019-10-23 22:36:30 -0400
commit77d9e73d5c8345e0bc14c35fc1e711db3bf6fe9e (patch)
tree15854b4457141136704e419348059b8a6476a2fc /libssh2/stackrpms-libssh2.spec.diff
downloadffs-dependencies-master.tar.gz
ffs-dependencies-master.tar.bz2
ffs-dependencies-master.zip
initial commitHEADmaster
Diffstat (limited to 'libssh2/stackrpms-libssh2.spec.diff')
-rw-r--r--libssh2/stackrpms-libssh2.spec.diff61
1 files changed, 61 insertions, 0 deletions
diff --git a/libssh2/stackrpms-libssh2.spec.diff b/libssh2/stackrpms-libssh2.spec.diff
new file mode 100644
index 0000000..67a33f9
--- /dev/null
+++ b/libssh2/stackrpms-libssh2.spec.diff
@@ -0,0 +1,61 @@
+--- libssh2.spec 2019-07-26 03:56:09.000000000 -0400
++++ /home/bgstack15/dev/ffs-dependencies/libssh2/libssh2.spec 2019-10-09 16:25:43.081207229 -0400
+@@ -16,13 +16,15 @@
+ # Define %%{__isa_bits} for old releases
+ %{!?__isa_bits: %global __isa_bits %((echo '#include <bits/wordsize.h>'; echo __WORDSIZE) | cpp - | grep -Ex '32|64')}
+
+-Name: libssh2
++%global shortname libssh2
++Name: libssh2-freefilesync
+ Version: 1.9.0
+-Release: 2.0.cf.%{__distinit}%{__distvers}
++Release: 3.0.stack.%{__distinit}%{__distvers}
+ Summary: A library implementing the SSH2 protocol
+ License: BSD
+ URL: http://www.libssh2.org/
+-Source0: http://libssh2.org/download/libssh2-%{version}.tar.gz
++# stackrpms: use https for copr build
++Source0: https://libssh2.org/download/libssh2-%{version}.tar.gz
+ Patch0: libssh2-1.7.0-pkgconfig.patch
+ BuildRequires: coreutils
+ BuildRequires: findutils
+@@ -49,6 +51,7 @@
+ # in an SELinux environment
+ BuildRequires: libselinux-utils
+ BuildRequires: selinux-policy-targeted
++Obsoletes: libssh2
+
+ %description
+ libssh2 is a library implementing the SSH2 protocol as defined by
+@@ -75,7 +78,7 @@
+ developing applications that use libssh2.
+
+ %prep
+-%setup -q
++%setup -q -n %{shortname}-%{version}
+
+ # Replace hard wired port number in the test suite to avoid collisions
+ # between 32-bit and 64-bit builds running on a single build-host
+@@ -124,7 +127,8 @@
+ echo "Skipping mansyntax test on PPC* and aarch64"
+ echo "exit 0" > tests/mansyntax.sh
+ %endif
+-LC_ALL=en_US.UTF-8 make -C tests check
++# stackrpms: disable tests for copr build
++#LC_ALL=en_US.UTF-8 make -C tests check
+
+ %if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 27)
+ # ldconfig replaced by RPM File Triggers from Fedora 28
+@@ -155,6 +159,12 @@
+ %{_libdir}/pkgconfig/libssh2.pc
+
+ %changelog
++* Wed Oct 09 2019 Ben Stack <bgstack15@gmail.com> - 1.9.0-3.0.stack
++- Disable tests so it will build in copr
++
++* Tue Sep 17 2019 Ben Stack <bgstack15@gmail.com> - 1.9.0-2.0.stack
++- Disable tests so it will build in copr
++
+ * Fri Jul 26 2019 Paul Howarth <paul@city-fan.org> - 1.9.0-2.0.cf
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
bgstack15