[syntaxhighlighter] cleanups
Remi Collet
remi at fedoraproject.org
Mon Jun 17 16:49:38 UTC 2013
commit 77c799bfe0c81f1c6f89db593fe08ff7ffed2f57
Author: Remi Collet <remi at fedoraproject.org>
Date: Mon Jun 17 18:49:19 2013 +0200
cleanups
.gitignore | 1 +
syntaxhighlighter.spec | 10 +---------
2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95bd5f3..6225f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+*spec~
/syntaxhighlighter-3.0.83-682bf8cfd5a0686d51ed16325b72625ddf64ae11.tar.gz
diff --git a/syntaxhighlighter.spec b/syntaxhighlighter.spec
index 5271dad..66a9bb0 100644
--- a/syntaxhighlighter.spec
+++ b/syntaxhighlighter.spec
@@ -30,7 +30,6 @@ Source3: https://raw.github.com/%{gh_owner}/%{gh_name}/master/GPL-LICENSE
# not submitted, as upstream don't use phing anymore
Patch0: %{name}-build.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: jre >= 1.6.0
BuildRequires: php-pear-phing
@@ -70,7 +69,7 @@ sed -e s/@REVISION@/$REV/ \
-i build/ext/RevisionTask.php
: License files
-cp %{SOURCE2} %{SOURCE3} .
+cp -p %{SOURCE2} %{SOURCE3} .
%build
@@ -82,8 +81,6 @@ phing -f build.xml
%install
-rm -rf %{buildroot}
-
: install JavaScript
mkdir -p %{buildroot}%{_datadir}/%{name}
cp -pr build/output/scripts %{buildroot}%{_datadir}/%{name}/scripts
@@ -94,10 +91,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d
-%clean
-rm -rf %{buildroot}
-
-
%files
%defattr(-,root,root,-)
%doc GPL-LICENSE MIT-LICENSE demos
@@ -105,7 +98,6 @@ rm -rf %{buildroot}
%files httpd
-%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
More information about the scm-commits
mailing list