- drop obsolete and outdated manual inclusion of rpm macros

diff --git a/gef.spec b/gef.spec
index e3dac7faa6be58ddaa12ae26eb5a9f6a2696d614..b3f1540d92a84b39b37a2c73512bcfb241141741 100644 (file)
--- a/gef.spec
+++ b/gef.spec
@@ -1,5 +1,5 @@
 # TODO:
-# javadoc package
+# - javadoc package
 Summary:       A diagram editing framework
 Summary(pl.UTF-8):     Szkielet do edycji diagramów
 Name:          gef
@@ -12,8 +12,11 @@ Source0:     http://gef.tigris.org/files/documents/9/10445/GEF-%{version}-src.zip
 URL:           http://gef.tigris.org/
 BuildRequires: ant
 BuildRequires: jakarta-commons-logging
+BuildRequires: jpackage-utils
+BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: unzip
 Requires:      jakarta-log4j
+Requires:      jpackage-utils
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,11 +74,10 @@ mkdir src
 cd src
 unzip -q %{SOURCE0}
 # remove binary files
-find . -name "*.jar" -exec rm -f {} \;
+find -name '*.jar' | xargs rm -v
 
 %build
-cd src
-ant package
+%ant package
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,4 +90,4 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc src/COPYRIGHT src/INSTALL.txt src/readme.txt
-%{_javadir}/*
+%{_javadir}/*.jar