diff --git a/.gitignore b/.gitignore
index a1d0ff8..4493a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
jdom-1.1.1.tar.gz
+jdom-1.1.2.tar.gz
diff --git a/jdom-1.1.2.pom b/jdom-1.1.2.pom
new file mode 100644
index 0000000..982de98
--- /dev/null
+++ b/jdom-1.1.2.pom
@@ -0,0 +1,75 @@
+
+ 4.0.0
+ org.jdom
+ jdom
+ jar
+
+ JDOM
+ 1.1.2
+
+
+ A complete, Java-based solution for accessing, manipulating,
+ and outputting XML data
+
+ http://www.jdom.org
+
+
+ JDOM
+ http://www.jdom.org
+
+
+
+
+ JDOM-interest Mailing List
+ jdom-interest@jdom.org
+ http://jdom.markmail.org/
+
+
+
+
+
+ Similar to Apache License but with the acknowledgment clause removed
+ https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt
+ repo
+
+
+
+
+ git@github.com:/hunterhacker/jdom
+ scm:git:git@github.com:hunterhacker/jdom
+ scm:git:git@github.com:hunterhacker/jdom
+
+
+
+
+ hunterhacker
+ Jason Hunter
+ jhunter@servlets.com
+
+
+ rolfl
+ Rolf Lear
+ jdom@tuis.net
+
+
+
+
+
+ jaxen
+ jaxen
+ 1.1.3
+ compile
+
+
+ xerces
+ xercesImpl
+ 2.10.0
+ true
+
+
+
+
+
+ 1.2
+
+
diff --git a/jdom-cleanup-pom.patch b/jdom-cleanup-pom.patch
deleted file mode 100644
index 2ffaa92..0000000
--- a/jdom-cleanup-pom.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- jdom-1.1.pom.orig 2010-02-05 11:25:52.525720695 +0000
-+++ jdom-1.1.pom 2010-02-05 11:26:53.387657825 +0000
-@@ -4,7 +4,7 @@
-
- org.jdom
- jdom
-- 1.1
-+ 1.1.1
- jar
-
- JDOM
-@@ -20,42 +20,4 @@
- scm:cvs:pserver:anonymous@cvs.jdom.org:/home/cvspublic:jdom
-
-
--
--
-- xerces
-- xercesImpl
-- 2.6.1
-- true
--
--
-- xerces
-- xmlParserAPIs
-- 2.6.1
-- true
--
--
-- org.jdom
-- jaxen-core
-- 1.0-FCS
-- true
--
--
-- org.jdom
-- jaxen-jdom
-- 1.0-FCS
-- true
--
--
-- org.jdom
-- saxpath
-- 1.0-FCS
-- true
--
--
-- xalan
-- xalan
-- 2.5.D1
-- true
--
--
-
diff --git a/jdom.spec b/jdom.spec
index 770bdb7..db86a8d 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -29,27 +29,23 @@
#
Name: jdom
-Version: 1.1.1
-Release: 5%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
Epoch: 0
Summary: Java alternative to DOM and SAX
License: ASL 1.1
URL: http://www.jdom.org/
Group: Development/Libraries
Source0: http://jdom.org/dist/binary/jdom-%{version}.tar.gz
-Source1: http://repo1.maven.org/maven2/org/jdom/jdom/1.1/jdom-1.1.pom
+Source1: http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{version}.pom
Patch0: %{name}-crosslink.patch
Patch1: %{name}-1.0-OSGiManifest.patch
-# Change version number and remove dependencies that don't have POMs yet
-Patch2: %{name}-cleanup-pom.patch
Requires: xalan-j2 >= 0:2.2.0
BuildRequires: ant >= 0:1.6
BuildRequires: xalan-j2 >= 0:2.2.0
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: java-javadoc
BuildArch: noarch
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Requires: jpackage-utils
%description
@@ -79,24 +75,20 @@ Demonstrations and samples for %{name}.
%prep
%setup -q -n %{name}
-cp %{SOURCE1} .
%patch0 -p0
%patch1 -p0
-%patch2 -p0
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
find . -name "*.class" -exec rm -f {} \;
%build
export CLASSPATH=$(build-classpath xalan-j2)
-sed -e 's| tempf; cp tempf build.xml; rm tempf
ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link
-
%install
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p build/%{name}-%{version}-snap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -108,41 +100,28 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
# maven stuff
mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp jdom-1.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
-%add_to_maven_depmap org.jdom %{name} %{version} JPP %{name}
-
-# compatibility depmap
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
+%add_maven_depmap JPP-jdom.pom %{name}.jar -a "jdom:jdom"
%files
-%defattr(-,root,root,-)
%doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
%{_javadir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/*.pom
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%doc LICENSE.txt
%files demo
-%defattr(-,root,root,-)
%{_datadir}/%{name}
%doc LICENSE.txt
%changelog
+* Wed Nov 2 2011 Alexander Kurtakov 0:1.1.2-1
+- New upstream version.
+- Adapt to current guidelines.
+
* Wed Feb 09 2011 Fedora Release Engineering - 0:1.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 7571322..f2c3444 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ad116194e3101fb08fab8f6f00cc58f jdom-1.1.1.tar.gz
+a18b39aaf6b855cc0fdea590a7cc4fa0 jdom-1.1.2.tar.gz