From 5c85f1fec5679df1af053fd04d7a59ef73e0bec3 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 23 2015 15:29:45 +0000
Subject: Update to version 1.1.9


---

diff --git a/.gitignore b/.gitignore
index 63b5ea6..14c3d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /ironjacamar-1.1.0.Final-CLEAN.tar.xz
 /ironjacamar-1.1.2.Final-CLEAN.tar.xz
 /ironjacamar-1.1.3.Final-CLEAN.tar.xz
+/ironjacamar-1.1.9.Final-CLEAN.tar.xz
+/ironjacamar-*.pom
diff --git a/ironjacamar.spec b/ironjacamar.spec
index faaf50e..b41caa2 100644
--- a/ironjacamar.spec
+++ b/ironjacamar.spec
@@ -2,17 +2,13 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             ironjacamar
-Version:          1.1.3
-Release:          4%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 Summary:          Java Connector Architecture 1.7 implementation
 License:          LGPLv2+
 URL:              http://www.ironjacamar.org/
 
-# git clone https://github.com/ironjacamar/ironjacamar.git
-# cd ironjacamar && git checkout ironjacamar-1.1.3.Final && git checkout-index -f -a --prefix=ironjacamar-1.1.3.Final/
-# find ironjacamar-1.1.3.Final -name '*.jar' -type f -exec rm -vf '{}' \;
-# tar -cJf ironjacamar-1.1.3.Final-CLEAN.tar.xz ironjacamar-1.1.3.Final
-Source0:          ironjacamar-%{namedversion}-CLEAN.tar.xz
+Source0:          https://github.com/ironjacamar/ironjacamar/archive/ironjacamar-%{version}.Final.tar.gz
 
 # Remote POM's...
 # Use spectool -g to get them
@@ -88,15 +84,12 @@ Requires:         jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
-
-%patch0 -p1
-%patch1 -p1
+%autosetup -n %{name}-%{name}-%{namedversion}
 
 # Yes, a bit ugly because we copy also the source code
 cp %{sources} .
 # Let's remove it
-rm -rf %{name}-%{namedversion}-CLEAN.tar.xz
+rm $(basename %{SOURCE0})
 
 # Fixing JDK7 ASCII issues
 files='
@@ -113,13 +106,15 @@ cp -r doc/licenses/lgpl-2.1.txt LICENSE.txt
 
 mkdir lib
 
+sed -i '/IronJacamar requires JDK7/d' build.xml
+
 %build
 ant -Das jars-base clean docs
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} \
+         $RPM_BUILD_ROOT%{_mavenpomdir} \
+         $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # common-impl-papaki validator-cli validator-maven validator-ant - not built in when nexus/brew target is selected
 # deployers-fungal - no fungal package avaialble
@@ -135,17 +130,19 @@ done
 # APIDOCS
 cp -rp target/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-%doc README.md LICENSE.txt
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc README.md
+%license LICENSE.txt
 
 %files javadoc
 %{_javadocdir}/%{name}
-%doc LICENSE.txt
+%license LICENSE.txt
 
 %changelog
+* Mon Jul 20 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.1.9-1
+- Update to latest release of 1.1.x branch (#1239580, #1108527)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 3578b42..7ca152b 100644
--- a/sources
+++ b/sources
@@ -1 +1,13 @@
-09d5a909288f409e5a09e816b8cd217a  ironjacamar-1.1.3.Final-CLEAN.tar.xz
+227bcd8c7de839ca6c3c556195a14992  ironjacamar-1.1.9.Final.tar.gz
+c52cc0ea4cc7801989e6c7d147721cc3  ironjacamar-common-api-1.1.9.Final.pom
+a9cbfb37fe782cff1f23b0d575f3e404  ironjacamar-common-impl-1.1.9.Final.pom
+a23ee857a1abbbdce72942252e96cbc6  ironjacamar-common-spi-1.1.9.Final.pom
+125a48291e36fc503db4139c87aad354  ironjacamar-core-api-1.1.9.Final.pom
+d5e7e4a34cd547c910ceae1e88039519  ironjacamar-core-impl-1.1.9.Final.pom
+baea921bef71ac861c18f5f9a5895738  ironjacamar-deployers-common-1.1.9.Final.pom
+3b2c3fb4cd6dc43b7bf1e134e6fe5205  ironjacamar-jdbc-1.1.9.Final.pom
+b1011eb57a2c83da35060775dc8ad5e2  ironjacamar-spec-api-1.1.9.Final.pom
+4ce947df5f77fc75afe03a95b663a30f  ironjacamar-validator-1.1.9.Final.pom
+28a2cd129ef136481540c87767f24f0d  ironjacamar-validator-ant-1.1.9.Final.pom
+c76bb720195bd50ee11c34296032536e  ironjacamar-validator-cli-1.1.9.Final.pom
+f9dd1fd1b27614a1e56ca003873fc353  ironjacamar-validator-maven-1.1.9.Final.pom