[jboss-jaspi-1.0-api] Packaging after license cleanup upstream

[Marek Goldmann]

commit 2f275ec62810bf0a0fff23e4b4907bbe837faee9
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Mar 9 15:11:52 2012 +0100

    Packaging after license cleanup upstream

 .gitignore                                         |    1 +
 ...s-jaspi-1.0-api-1.0.0.Final-invalid-chars.patch |  109 --------------------
 jboss-jaspi-1.0-api.spec                           |   40 +++++--
 sources                                            |    2 +-
 4 files changed, 30 insertions(+), 122 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 577f8d3..b5bfbb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jboss-jaspi-1.0-api-1.0.0.Final.tar.xz
+/jboss-jaspi-1.0-api-1.0.1.20120309gitdc8eed.tar.xz
diff --git a/jboss-jaspi-1.0-api.spec b/jboss-jaspi-1.0-api.spec
index 9588ff7..5858294 100644
--- a/jboss-jaspi-1.0-api.spec
+++ b/jboss-jaspi-1.0-api.spec
@@ -1,21 +1,18 @@
-%global namedreltag .Final
+%global namedreltag .20120309gitdc8eed
 %global namedversion %{version}%{?namedreltag}
 
 Name:		jboss-jaspi-1.0-api
-Version:	1.0.0
-Release:	3%{?dist}
+Version:	1.0.1
+Release:	0.1%{namedreltag}%{?dist}
 Summary:	JBoss Java Authentication SPI for Containers 1.0 API
 Group:		Development/Libraries
-License:	LGPLv2+
+License:	CDDL or GPLv2 with exceptions
 URL:		http://www.jboss.org
 
 # git clone git://github.com/jboss/jboss-jaspi-api_spec.git
-# cd jboss-jaspi-api_spec/ && git archive --format=tar --prefix=jboss-jaspi-1.0-api-1.0.0.Final/ jboss-jaspi-api_1.0_spec-1.0.0.Final | xz > jboss-jaspi-1.0-api-1.0.0.Final.tar.xz
+# cd jboss-jaspi-api_spec/ && git archive --format=tar --prefix=jboss-jaspi-1.0-api/ dc8eedb8526ebdc76dcd37951a3cce609613f39c | xz > jboss-jaspi-1.0-api-1.0.1.20120309gitdc8eed.tar.xz
 Source0:	%{name}-%{namedversion}.tar.xz
 
-# Patch to fix invalid ASCII chars
-Patch0:		%{name}-%{namedversion}-invalid-chars.patch
-
 BuildRequires:	jpackage-utils
 BuildRequires:	java-devel
 BuildRequires:	maven
@@ -44,8 +41,22 @@ Requires:	jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
-%patch0 -p1
+%setup -q -n jboss-jaspi-1.0-api
+
+# Fixing JDK7 ASCII issues
+files='
+src/main/java/javax/security/auth/message/callback/PasswordValidationCallback.java
+src/main/java/javax/security/auth/message/config/AuthConfigFactory.java
+src/main/java/javax/security/auth/message/config/AuthConfigProvider.java
+src/main/java/javax/security/auth/message/config/ClientAuthConfig.java
+src/main/java/javax/security/auth/message/config/ServerAuthConfig.java
+src/main/java/javax/security/auth/message/module/ClientAuthModule.java
+src/main/java/javax/security/auth/message/module/ServerAuthModule.java
+'
+
+for f in ${files}; do
+  native2ascii -encoding UTF8 ${f} ${f}
+done
 
 %build
 mvn-rpmbuild install javadoc:aggregate
@@ -53,27 +64,32 @@ mvn-rpmbuild install javadoc:aggregate
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # JAR
-install -pm 644 target/jboss-jaspi-api_1.0_spec-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -pm 644 target/jboss-jaspi-api_1.0_spec-%{version}-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # POM
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
+%doc LICENSE README
 
 %files javadoc
 %{_javadocdir}/%{name}
+%doc LICENSE
 
 %changelog
+* Fri Mar 09 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.1-0.1.20120309gitdc8eed
+- Packaging after license cleanup upstream
+
 * Fri Feb 24 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.0-3
 - Relocated jars to _javadir
 
diff --git a/sources b/sources
index 6928de3..3d7ac63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4967586d66479af54f431773e52ee25  jboss-jaspi-1.0-api-1.0.0.Final.tar.xz
+d2f4885b31754f3bee87115054e51c60  jboss-jaspi-1.0-api-1.0.1.20120309gitdc8eed.tar.xz