diff --git a/testng.depmap b/testng.depmap
deleted file mode 100644
index 2571680..0000000
--- a/testng.depmap
+++ /dev/null
@@ -1,12 +0,0 @@
-<dependencies>
-    <dependency>
-      <maven>
-        <groupId>com.google.gdata</groupId>
-        <artifactId>gdata-core</artifactId>
-      </maven>
-      <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>gdata/gdata-core</artifactId>
-      </jpp>
-    </dependency>
-</dependencies>
diff --git a/testng.spec b/testng.spec
index ee018fa..9468fa4 100644
--- a/testng.spec
+++ b/testng.spec
@@ -3,7 +3,7 @@
 
 Name:             testng
 Version:          6.0.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Java-based testing framework
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -12,7 +12,6 @@ URL:              http://testng.org/
 # cd testng
 # git archive --prefix="testng-6.0.1/" --format=tar testng-6.0.1 | xz > testng-6.0.1.tar.xz
 Source0:          %{name}-%{version}.tar.xz
-Source1:          %{name}.depmap
 
 Patch0:           %{name}-test-fails-workaround.patch
 
@@ -28,8 +27,6 @@ Requires:         beust-jcommander
 Requires:         snakeyaml
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 TestNG is a testing framework inspired from JUnit and NUnit but introducing
@@ -85,9 +82,7 @@ iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8
 mv -f CHANGES.txt.utf8 CHANGES.txt
 
 %build
-# gdata-java has no maven support -> depmap file needed
-# http://code.google.com/p/gdata-java-client/issues/detail?id=328
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" -Dgpg.skip=true install javadoc:aggregate
+mvn-rpmbuild -Dmaven.local.debug=true -Dgpg.skip=true install javadoc:aggregate
 
 %install
 # jars
@@ -97,18 +92,12 @@ install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name}
+%add_maven_depmap
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README
 %{_javadir}/%{name}.jar
@@ -120,6 +109,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.0.1-4
+- Spec file cleanups and add_maven_depmap macro use
+- Drop no longer needed depmap
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild