General package cleanup

- Enable tests
- Install NOTICE with javadoc package
- Fix file permissions
- Remove versioned symlinks
This commit is contained in:
Mikolaj Izdebski 2012-08-07 14:11:19 +02:00 committed by Stanislav Ochotnicky
parent cca0469a96
commit 7f7c637db7

View File

@ -3,7 +3,7 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.6 Version: 1.6
Release: 3%{?dist} Release: 4%{?dist}
Summary: Implementations of common encoders and decoders Summary: Implementations of common encoders and decoders
Group: Development/Libraries Group: Development/Libraries
License: ASL 2.0 License: ASL 2.0
@ -57,20 +57,21 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
%build %build
mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:javadoc mvn-rpmbuild install javadoc:javadoc
%install %install
# jars # jars
install -pD -T target/%{short_name}-%{version}.jar \ install -d -m 755 %{buildroot}%{_javadir}
install -p -m 644 target/%{short_name}-%{version}.jar \
%{buildroot}%{_javadir}/%{short_name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
# javadocs # javadocs
install -d -m 755 %{buildroot}%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# pom # pom
install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom install -d -m 755 %{buildroot}%{_mavenpomdir}
install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}" %add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
%files %files
@ -80,10 +81,16 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%{_javadir}/* %{_javadir}/*
%files javadoc %files javadoc
%doc LICENSE.txt %doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-4
- Enable tests
- Install NOTICE with javadoc package
- Fix file permissions
- Remove versioned symlinks
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild