Update to latest upstream release, 6.8
This commit is contained in:
Mat Booth
parent
9be560a46f
commit
7ac0586f8f
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
testng-5.11.zip
|
||||
/testng-6.0.1.tar.xz
|
||||
/testng-6.8.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
a861651088aa47a7a350bdfaf0a824ae testng-6.0.1.tar.xz
|
||||
7a61453eed2218d4f905fe8c7d4f9501 testng-6.8.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur testng-6.0.1.orig/src/test/java/test/junit/Suite2.java testng-6.0.1/src/test/java/test/junit/Suite2.java
|
||||
--- testng-6.0.1.orig/src/test/java/test/junit/Suite2.java 2011-03-24 21:09:34.000000000 +0100
|
||||
+++ testng-6.0.1/src/test/java/test/junit/Suite2.java 2011-06-01 18:50:24.260159540 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
TestSuite suite = new TestSuite("Suite2");
|
||||
suite.addTestSuite(TestAc.class);
|
||||
suite.addTestSuite(TestAd.class);
|
||||
- suite.addTestSuite(Suite3.class);
|
||||
+// suite.addTestSuite(Suite3.class);
|
||||
return suite;
|
||||
}
|
||||
}
|
||||
65
testng.spec
65
testng.spec
@ -2,32 +2,29 @@
|
||||
%global group_id org.testng
|
||||
|
||||
Name: testng
|
||||
Version: 6.0.1
|
||||
Release: 6%{?dist}
|
||||
Version: 6.8
|
||||
Release: 1%{?dist}
|
||||
Summary: Java-based testing framework
|
||||
# .../remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
|
||||
# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
|
||||
License: ASL 2.0 and CPL
|
||||
Group: Development/Libraries
|
||||
URL: http://testng.org/
|
||||
# git clone git://github.com/cbeust/testng.git
|
||||
# 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
|
||||
|
||||
Patch0: %{name}-test-fails-workaround.patch
|
||||
Source0: https://github.com/cbeust/testng/archive/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: beust-jcommander
|
||||
BuildRequires: beust-jcommander >= 1.27
|
||||
BuildRequires: snakeyaml
|
||||
BuildRequires: google-guice
|
||||
|
||||
Requires: beust-jcommander
|
||||
Requires: snakeyaml
|
||||
Requires: java
|
||||
Requires: jpackage-utils
|
||||
Requires: beust-jcommander >= 1.27
|
||||
Requires: snakeyaml
|
||||
Requires: google-guice
|
||||
|
||||
%description
|
||||
TestNG is a testing framework inspired from JUnit and NUnit but introducing
|
||||
@ -44,43 +41,30 @@ Requires: jpackage-utils
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %{name}-%{name}-%{version}
|
||||
|
||||
%patch0 -p1
|
||||
# build fix for new guice
|
||||
sed -i "s|com.google.inject.internal|com.google.common.collect|" \
|
||||
src/main/java/org/testng/xml/XmlDependencies.java \
|
||||
src/main/java/org/testng/xml/XmlGroups.java \
|
||||
src/main/java/org/testng/xml/dom/TestNGTagFactory.java \
|
||||
src/test/java/test/dependent/InstanceSkipSampleTest.java \
|
||||
src/test/java/test/mustache/MustacheTest.java \
|
||||
src/test/java/test/thread/B.java
|
||||
|
||||
# remove bundled stuff
|
||||
rm -rf spring
|
||||
rm -rf 3rdparty
|
||||
rm -rf doc
|
||||
rm -rf lib-supplied
|
||||
rm -rf gigaspaces
|
||||
rm -rf sandbox
|
||||
rm -rf examples
|
||||
rm -f *.jar
|
||||
|
||||
|
||||
# fix the ant group_id ... ant -> org.apache.ant
|
||||
sed -i 's/<groupId>ant/<groupId>org.apache.ant/g' pom.xml
|
||||
|
||||
# replace CR+LF with LF
|
||||
sed -i 's/\r//g' README
|
||||
|
||||
# convert to UTF8
|
||||
|
||||
#$ enca CHANGES.txt
|
||||
#Unrecognized encoding
|
||||
#$ enca ANNOUNCEMENT.txt
|
||||
#Unrecognized encoding
|
||||
|
||||
#$ chardet-file ANNOUNCEMENT.txt
|
||||
#{'confidence': 0.8484260688832136, 'encoding': 'ISO-8859-2'}
|
||||
#$ chardet-file CHANGES.txt
|
||||
#{'confidence': 0.7833420201466339, 'encoding': 'ISO-8859-2'}
|
||||
# convert to UTF-8
|
||||
native2ascii -encoding UTF-8 src/main/java/org/testng/internal/Version.java \
|
||||
src/main/java/org/testng/internal/Version.java
|
||||
|
||||
iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8
|
||||
mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt
|
||||
iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8
|
||||
mv -f CHANGES.txt.utf8 CHANGES.txt
|
||||
|
||||
%build
|
||||
mvn-rpmbuild -Dmaven.local.debug=true -Dgpg.skip=true install javadoc:aggregate
|
||||
@ -93,7 +77,7 @@ 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_maven_depmap
|
||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
||||
|
||||
# javadoc
|
||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
@ -107,9 +91,12 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%files javadoc
|
||||
%doc LICENSE.txt
|
||||
%doc %{_javadocdir}/%{name}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Sun Feb 10 2013 Mat Booth <fedora@matbooth.co.uk> - 6.8-1
|
||||
- Update to latest upstream release, rhbz #888233
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 6.0.1-6
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
Loading…
Reference in New Issue
Block a user