From 28f14017e0b5add1a9e2b88947e24c1b43c98ad0 Mon Sep 17 00:00:00 2001 From: chenyanpanHW Date: Fri, 30 Jul 2021 23:38:03 +0800 Subject: [PATCH] delete -S git from %autosetup, and delete BuildRequires git --- tomcatjss.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tomcatjss.spec b/tomcatjss.spec index d7216bd..5b1c6bd 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -4,9 +4,9 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch Version: 7.4.1 -Release: 3 +Release: 4 Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz -BuildRequires: git ant apache-commons-lang java-devel jpackage-utils >= 0:1.7.5-15 slf4j +BuildRequires: ant apache-commons-lang java-devel jpackage-utils >= 0:1.7.5-15 slf4j BuildRequires: slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7 Requires: apache-commons-lang java-headless jpackage-utils >= 0:1.7.5-15 slf4j jss >= 4.6.0 tomcat >= 1:9.0.7 Conflicts: tomcat-native pki-base < 10.6.5 @@ -16,7 +16,7 @@ Conflicts: tomcat-native pki-base < 10.6.5 Apache Tomcat of JSS Connector. %prep -%autosetup -n tomcatjss-%{version} -p 1 -S git +%autosetup -n tomcatjss-%{version} -p 1 %install tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'` @@ -36,5 +36,8 @@ ant -f build.xml -Dversion=%{version} -Dsrc.dir=$app_server -Djnidir=%{_jnidir} %{_javadir}/* %changelog +* Fri Jul 30 2021 chenyanpanHW - 7.4.1-4 +- DESC: delete -S git from %autosetup, and delete BuildRequires git + * Sun Apr 26 2020 wutao - 7.4.1-3 - Package init -- Gitee