[jFormatString] Clean up spec file

richardfearn richardfearn at fedoraproject.org
Sun Feb 10 20:54:23 UTC 2013


commit e93f7a1ce5c189c7747e64bda093ee880c9fccc2
Author: Richard Fearn <richardfearn at gmail.com>
Date:   Sun Feb 10 19:56:50 2013 +0000

    Clean up spec file
    
    * Use standard groups
    * Remove "rm -rf" from %install section
    * Replace $RPM_BUILD_ROOT with %{buildroot}
    * Remove %defattr's from %files sections

 jFormatString.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/jFormatString.spec b/jFormatString.spec
index 9e62074..4c060be 100644
--- a/jFormatString.spec
+++ b/jFormatString.spec
@@ -3,7 +3,7 @@ Version:        0
 Release:        0.7.20081016svn%{?dist}
 Summary:        Java format string compile-time checker
 
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 License:        GPLv2 with exceptions
 URL:            https://jformatstring.dev.java.net/
 # There has been no official release yet.  This is a snapshot of the Subversion
@@ -30,7 +30,7 @@ format string will be erroneous when executed at runtime.
 
 %package javadoc
 Summary:        Javadoc documentation for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name} = %{version}-%{release}, java-javadoc
 Requires:       jpackage-utils
 
@@ -54,25 +54,22 @@ javadoc -d docs -source 1.5 -sourcepath jFormatString/src/java \
   -link file://%{_javadocdir}/java edu.umd.cs.findbugs.formatStringChecker
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 # JAR files
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
 cp -p %{name}/build/%{name}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+  %{buildroot}%{_javadir}/%{name}.jar
 
 # Javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -rp docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root,-)
 %doc www/index.html jFormatString/LICENSE
 %{_javadir}/%{name}*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}*
 
 %changelog


More information about the scm-commits mailing list