| |
@@ -2,7 +2,7 @@
|
| |
Version: 0.7.0
|
| |
Summary: Low interaction honeypot
|
| |
# Show as the RPM release number (keep same number line for tarball and git builds)
|
| |
- %global baserelease 18
|
| |
+ %global baserelease 19
|
| |
|
| |
%if 0%{?rhel}
|
| |
# Group needed for EPEL
|
| |
@@ -132,7 +132,7 @@
|
| |
BuildRequires: bison
|
| |
BuildRequires: pkgconfig
|
| |
BuildRequires: sqlite
|
| |
- BuildRequires: git
|
| |
+ BuildRequires: git-core
|
| |
|
| |
BuildRequires: libev-devel
|
| |
BuildRequires: libemu-devel
|
| |
@@ -229,24 +229,12 @@
|
| |
%prep
|
| |
%if 0%{?with_snapshot}
|
| |
# Build from git snapshot
|
| |
- %autosetup -p 1 -n %{gitname}-%{commit} -N
|
| |
+ %autosetup -p 1 -n %{gitname}-%{commit} -S git
|
| |
%else
|
| |
# Build from git release version
|
| |
- %autosetup -p 1 -n %{gitname}-%{version} -N
|
| |
+ %autosetup -p 1 -n %{gitname}-%{version} -S git
|
| |
%endif
|
| |
|
| |
- # Re-initialize the git repo, to track changes even on files ignored by the upstream
|
| |
- rm -rf .git
|
| |
- # Remove the .gitignore to prevent ignoring changes in some files
|
| |
- rm -f .gitignore
|
| |
- git init -q
|
| |
- git config user.email "rpmbuild"
|
| |
- git config user.name "rpmbuild"
|
| |
- git add .
|
| |
- git commit -a -m "base"
|
| |
-
|
| |
- %autopatch -p 1
|
| |
-
|
| |
# Unbundle the pyev library and use the system one
|
| |
# https://github.com/DinoTools/dionaea/issues/169
|
| |
rm -rf modules/python/pyev
|
| |
@@ -493,6 +481,9 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Sun Mar 12 2023 Todd Zullinger <tmz@pobox.com> - 0.7.0-19
|
| |
+ - use '%%autosetup -S git' to apply patches
|
| |
+
|
| |
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-18
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
| |
|
| |
tmz
commented 2 months ago
Replace manual git setup and patch application in %prep with the
equivalent from %autosetup.
With
%autosetup -S gitthere is no need to call rm -rf on .git or.gitignore. A .git directory should never end up in the source tree
(but would be irrelevant for the patch application anyway). And the
.gitignore is not an issue because the
%__scm_setup_gitmacro passesthe --force option to git add[*], which adds all files -- regardless of
whether they would be ignored.
Change BuildRequires: git to git-core, which saves a bit of space in the
buildroot.
[*] The macro on EL-7 lacks the --force option. With EL-7 very close to
EOL, it's highly unlikely that it's going to see any large merges from
the rawhide branch.