From 51fbd71daca4521f6df93be3cc56a9b82c85c4b5 Mon Sep 17 00:00:00 2001 From: mbooth Date: Jan 05 2010 18:34:35 +0000 Subject: - Fix unowned GCJ directory. - Fix packaging bug RHBZ #472646. --- diff --git a/xerces-j2.spec b/xerces-j2.spec index 86220ba..defe932 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -37,7 +37,7 @@ Name: xerces-j2 Version: 2.7.1 -Release: 11.3%{?dist} +Release: 11.3%{?dist}.1 Epoch: 0 Summary: Java XML parser License: ASL 2.0 @@ -248,17 +248,16 @@ ln -s %{name}-other-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other rm -rf build/docs/javadocs # manual -%if ! %{gcj_support} && ! %{bootstrap} +#%if ! %{gcj_support} && ! %{bootstrap} mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +#cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -p ISSUES $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -p LICENSE* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -p NOTICE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -p README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -p STATUS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} cp -p TODO $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - -%endif +#%endif # scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} @@ -325,12 +324,13 @@ fi %files %defattr(0644,root,root,0755) -%doc [A-Z]* +%doc %{_docdir}/%{name}-%{version} %{_javadir}/%{name}*.jar %{_javadir}/dom3-%{name}*.jar %ghost %{_javadir}/jaxp_parser_impl.jar %if %{gcj_support} +%dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %endif @@ -365,6 +365,7 @@ fi %{_datadir}/%{name} %if %{gcj_support} +%dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.* %endif @@ -374,6 +375,10 @@ fi %changelog +* Tue Jan 5 2010 Mat Booth - 0:2.7.1-11.3.1 +- Fix unowned GCJ directory. +- Fix packaging bug RHBZ #472646. + * Thu Feb 26 2009 Fedora Release Engineering - 0:2.7.1-11.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild