commit 212e4d1017439a19eea81758d60c1ee4eb6a58ad
Author: Elan Ruusamäe <[email protected]>
Date: Thu Dec 26 19:54:58 2013 +0000
use _tomcatconfdir macro; cosmetics
jtrac.spec | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/jtrac.spec b/jtrac.spec
index 32f4065..61c6ba5 100644
--- a/jtrac.spec
+++ b/jtrac.spec
@@ -7,7 +7,7 @@ Version: 2.1.0
Release: 4
License: Apache v2.0
Group: Networking/Daemons/Java/Servlets
-Source0:
http://downloads.sourceforge.net/project/j-trac/jtrac/2.1.0/%{name}-%{version}.zip
+Source0: http://downloads.sourceforge.net/j-trac/%{name}-%{version}.zip
# Source0-md5: 6254396d33012f65d0886b67287b257b
Source1: %{name}-context.xml
Source2: %{name}.properties
@@ -17,8 +17,8 @@ BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: unzip
-Requires: jre >= 1.6.0.17
Requires: jpackage-utils
+Requires: jre >= 1.6.0.17
Requires: tomcat
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,18 +31,17 @@ file attachments and a detailed history view.
%prep
%setup -qn %{name}
-
-unzip -qd jtrac jtrac.war
+%{__unzip} -qd jtrac jtrac.war
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir},%{_sharedstatedir}/{%{name},tomcat/conf/Catalina/localhost},/var/log/%{name}}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.properties
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
+install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_datadir},%{_sharedstatedir}/%{name},%{_tomcatconfdir},/var/log/%{name}}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.properties
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/log4j.properties
cp -a %{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -s %{_sysconfdir}/%{name}/tomcat-context.xml
$RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
+ln -s %{_sysconfdir}/%{name}/tomcat-context.xml
$RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
ln -s %{_sysconfdir}/%{name}/%{name}.properties
$RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/%{name}.properties
ln -sf %{_sysconfdir}/%{name}/log4j.properties
$RPM_BUILD_ROOT%{_datadir}/%{name}/WEB-INF/log4j.properties
@@ -51,8 +50,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%{_sharedstatedir}/tomcat/conf/Catalina/localhost/%{name}.xml
%verify(not md5 mtime size) %config(noreplace) %attr(750,root,servlet)
%{_sysconfdir}/%{name}
+%verify(not md5 mtime size) %config(noreplace) %{_tomcatconfdir}/%{name}.xml
%{_datadir}/%{name}
%attr(770,root,servlet) %{_sharedstatedir}/%{name}
%attr(770,root,servlet) /var/log/%{name}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jtrac.git/commitdiff/cfa0b7f38d56aaac5e99a6a401bf114d2adc607f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
