From df45e3f613a3a5395ead8a7d3d1dd8cc973a7f81 Mon Sep 17 00:00:00 2001
From: Mohamed El Morabity <melmorabity@fedoraproject.org>
Date: Tue, 4 Feb 2014 09:51:04 +0100
Subject: [PATCH] - Update to 1.2 - Adapt to current guidelines

---
 .gitignore               |  1 +
 apache-commons-exec.spec | 40 ++++++++++++++++++++--------------------
 sources                  |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8450be0..ada0b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 commons-exec-1.0.1-src.tar.gz
 /commons-exec-1.1-src.tar.gz
+/commons-exec-1.2-src.tar.gz
diff --git a/apache-commons-exec.spec b/apache-commons-exec.spec
index 47fa133..9620845 100644
--- a/apache-commons-exec.spec
+++ b/apache-commons-exec.spec
@@ -2,8 +2,8 @@
 %global short_name commons-%{base_name}
 
 Name:           apache-commons-exec
-Version:        1.1
-Release:        11%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Java library to reliably execute external processes from within the JVM
 
 Group:          Development/Libraries
@@ -38,41 +38,41 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
+# Fix wrong end-of-line encoding
+for file in LICENSE.txt NOTICE.txt STATUS; do
+  sed -i.orig "s/\r//" $file && \
+  touch -r $file.orig $file && \
+  rm $file.orig
+done
+
 # Shell scripts used for unit tests must be executable (see
 # http://commons.apache.org/exec/faq.html#environment-testing)
 chmod a+x src/test/scripts/*.sh
 
+%mvn_file :%{short_name} %{short_name} %{name}
+
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build 
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
-cp -p pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt STATUS
-%{_mavenpomdir}/*
-%{_javadir}/*.jar
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Feb 03 2014 Mohamed El Morabity <melmorabity@fedoraproject.org> - 1.2-1
+- Update to 1.2
+- Adapt to current guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 2d5103b..894dea1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3332b95456a5989d346d303daca2ae2  commons-exec-1.1-src.tar.gz
+c423f7268f3bd03c4602dc7fd12b5d4c  commons-exec-1.2-src.tar.gz