Remove unneeded BRs
- Update to current packaging guidelines
This commit is contained in:
Mikolaj Izdebski
parent
e99d985538
commit
d61fff496b
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/atinject-1.tar.xz
|
/atinject-1.tar.xz
|
||||||
|
/LICENSE-2.0.txt
|
||||||
|
|||||||
100
atinject.spec
100
atinject.spec
@ -1,35 +1,23 @@
|
|||||||
%global artifactId javax.inject
|
|
||||||
|
|
||||||
Name: atinject
|
Name: atinject
|
||||||
Version: 1
|
Version: 1
|
||||||
Release: 10.20100611svn86%{?dist}
|
Release: 11.20100611svn86%{?dist}
|
||||||
Summary: Dependency injection specification for Java (JSR-330)
|
Summary: Dependency injection specification for Java (JSR-330)
|
||||||
|
|
||||||
Group: Development/Libraries
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://code.google.com/p/atinject/
|
URL: http://code.google.com/p/atinject/
|
||||||
|
BuildArch: noarch
|
||||||
# latest release doesn't generate javadocs and there is no source
|
# latest release doesn't generate javadocs and there is no source
|
||||||
# tarball with pom.xml or ant build file
|
# tarball with pom.xml or ant build file
|
||||||
#
|
#
|
||||||
# svn export -r86 http://atinject.googlecode.com/svn/trunk atinject-1
|
# svn export -r86 http://atinject.googlecode.com/svn/trunk atinject-1
|
||||||
|
# rm -rf atinject-1/{lib,javadoc}/
|
||||||
# tar caf atinject-1.tar.xz atinject-1
|
# tar caf atinject-1.tar.xz atinject-1
|
||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Source1: MANIFEST.MF
|
Source1: MANIFEST.MF
|
||||||
BuildArch: noarch
|
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: java-devel
|
||||||
BuildRequires: maven-install-plugin
|
BuildRequires: junit
|
||||||
BuildRequires: maven-jar-plugin
|
Requires: java
|
||||||
BuildRequires: maven-surefire-provider-junit4
|
|
||||||
BuildRequires: maven-surefire-plugin
|
|
||||||
BuildRequires: maven-javadoc-plugin
|
|
||||||
BuildRequires: maven-resources-plugin
|
|
||||||
BuildRequires: maven-release-plugin
|
|
||||||
BuildRequires: maven-compiler-plugin
|
|
||||||
BuildRequires: zip
|
|
||||||
|
|
||||||
|
|
||||||
Requires: jpackage-utils
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package specifies a means for obtaining objects in such a way as
|
This package specifies a means for obtaining objects in such a way as
|
||||||
@ -40,16 +28,12 @@ beneficial to most nontrivial applications.
|
|||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: API documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
Group: Documentation
|
|
||||||
Requires: jpackage-utils
|
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package tck
|
%package tck
|
||||||
Summary: TCK for testing %{name} compatibility with JSR-330
|
Summary: TCK for testing %{name} compatibility with JSR-330
|
||||||
Group: Development/Libraries
|
|
||||||
Requires: jpackage-utils
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: junit
|
Requires: junit
|
||||||
|
|
||||||
@ -59,64 +43,54 @@ Requires: junit
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
cp %{SOURCE2} LICENSE
|
||||||
rm -rf lib/* javadoc/
|
ln -s %{_javadir} lib
|
||||||
|
|
||||||
ln -sf `build-classpath junit` lib/junit.jar
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./build.sh
|
set -e
|
||||||
pushd build
|
alias rm=:
|
||||||
for i in *.zip; do
|
alias xargs=:
|
||||||
unzip $i
|
. ./build.sh
|
||||||
done
|
|
||||||
|
|
||||||
#Add OSGi manifest for Eclipse
|
# Inject OSGi manifest required by Eclipse.
|
||||||
mkdir -p META-INF/
|
jar umf %{SOURCE1} build/dist/*.jar
|
||||||
cp %{SOURCE1} META-INF/MANIFEST.MF
|
|
||||||
zip -u javax.inject.jar META-INF/MANIFEST.MF
|
|
||||||
|
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
# Maven POMs
|
||||||
|
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||||
|
install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
|
install -p -m 644 tck-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tck.pom
|
||||||
|
|
||||||
|
# JARs
|
||||||
install -d -m 755 %{buildroot}%{_javadir}
|
install -d -m 755 %{buildroot}%{_javadir}
|
||||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
install -p -m 644 build/dist/*.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
|
install -p -m 644 build/tck/dist/*.jar %{buildroot}%{_javadir}/%{name}-tck.jar
|
||||||
|
|
||||||
# poms
|
# XMvn metadata
|
||||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
%add_maven_depmap
|
||||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|
||||||
install -pm 644 tck-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tck.pom
|
|
||||||
|
|
||||||
# jar files
|
|
||||||
install -pm 644 build/%{artifactId}.jar %{buildroot}%{_javadir}/%{name}.jar
|
|
||||||
install -pm 644 build/%{artifactId}-tck.jar %{buildroot}%{_javadir}/%{name}-tck.jar
|
|
||||||
|
|
||||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
|
||||||
%add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar -f tck
|
%add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar -f tck
|
||||||
|
|
||||||
# javadoc
|
# Javadocs
|
||||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}/tck
|
||||||
cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
cp -pr build/tck/javadoc/* %{buildroot}%{_javadocdir}/%{name}/tck
|
||||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-tck
|
|
||||||
cp -pr build/tck/javadoc/* %{buildroot}%{_javadocdir}/%{name}-tck
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files -f .mfiles
|
||||||
%{_mavenpomdir}/JPP-%{name}.pom
|
%doc LICENSE
|
||||||
%{_mavendepmapfragdir}/%{name}
|
|
||||||
%{_javadir}/%{name}.jar
|
|
||||||
|
|
||||||
%files tck
|
%files tck -f .mfiles-tck
|
||||||
%{_mavendepmapfragdir}/%{name}-tck
|
|
||||||
%{_javadir}/%{name}-tck.jar
|
|
||||||
%{_mavenpomdir}/JPP-%{name}-tck.pom
|
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
|
%doc LICENSE
|
||||||
%doc %{_javadocdir}/%{name}
|
%doc %{_javadocdir}/%{name}
|
||||||
%doc %{_javadocdir}/%{name}-tck
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-11.20100611svn86
|
||||||
|
- Remove unneeded BRs
|
||||||
|
- Install missing LICENSE file
|
||||||
|
- Update to current packaging guidelines
|
||||||
|
|
||||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1-10.20100611svn86
|
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1-10.20100611svn86
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user