Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 666156 Details for
Bug 888710
maven-doxia: split package into multiple subpackages
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
spec file patch
0001-Splitted-into-multiple-subpackages-Resolves-888710.patch (text/plain), 8.50 KB, created by
Michal Srb
on 2012-12-19 15:24:30 UTC
(
hide
)
Description:
spec file patch
Filename:
MIME Type:
Creator:
Michal Srb
Created:
2012-12-19 15:24:30 UTC
Size:
8.50 KB
patch
obsolete
>From c30b1daad480b574e4d61aef994f19da70a0e146 Mon Sep 17 00:00:00 2001 >From: Michal Srb <msrb@redhat.com> >Date: Wed, 19 Dec 2012 16:12:49 +0100 >Subject: [PATCH] Splitted into multiple subpackages (Resolves: #888710) > >--- > maven-doxia.spec | 250 ++++++++++++++++++++++++++++++++++++------------------- > 1 file changed, 163 insertions(+), 87 deletions(-) > >diff --git a/maven-doxia.spec b/maven-doxia.spec >index 58f9a6d..e79c3f7 100644 >--- a/maven-doxia.spec >+++ b/maven-doxia.spec >@@ -30,7 +30,7 @@ > > Name: maven-doxia > Version: 1.2 >-Release: 5%{?dist} >+Release: 6%{?dist} > Epoch: 0 > Summary: Content generation framework > License: ASL 2.0 >@@ -57,10 +57,11 @@ BuildArch: noarch > > BuildRequires: java >= 1:1.6.0 > BuildRequires: jpackage-utils >-BuildRequires: ant, ant-nodeps >+BuildRequires: ant >+BuildRequires: ant-nodeps > BuildRequires: itext > BuildRequires: plexus-cli >-BuildRequires: maven >+BuildRequires: xmvn > BuildRequires: maven-assembly-plugin > BuildRequires: maven-compiler-plugin > BuildRequires: maven-install-plugin >@@ -102,30 +103,6 @@ BuildRequires: geronimo-jms > BuildRequires: javamail > > >- >-Requires: classworlds >-Requires: apache-commons-collections >-Requires: apache-commons-logging >-Requires: apache-commons-validator >-Requires: junit >-Requires: jakarta-oro >-Requires: plexus-containers-container-default >-Requires: plexus-i18n >-Requires: plexus-utils >-Requires: plexus-velocity >-Requires: velocity >-Requires: fop >-Requires: httpcomponents-client >-Requires: httpcomponents-project >-Requires: geronimo-jms >-Requires: javamail >-# should be in geronimo-jms but that would pull maven even for ant use >-# of library so we don't add it there >-Requires: geronimo-parent-poms >- >-Requires: java >= 1:1.6.0 >-Requires: jpackage-utils >- > %description > Doxia is a content generation framework which aims to provide its > users with powerful techniques for generating static and dynamic >@@ -133,13 +110,123 @@ content. Doxia can be used to generate static sites in addition to > being incorporated into dynamic content generation systems like blogs, > wikis and content management systems. > >+ >+%package book >+Summary: Book module for %{name} >+ >+%description book >+This package provides %{summary}. >+ >+%package core >+Summary: Core module for %{name} >+ >+%description core >+This package provides %{summary}. >+ >+%package logging-api >+Summary: Logging-api module for %{name} >+ >+%description logging-api >+This package provides %{summary}. >+ >+%package maven-plugin >+Summary: Maven-plugin module for %{name} >+ >+%description maven-plugin >+This package provides %{summary}. >+ >+%package module-apt >+Summary: APT module for %{name} >+ >+%description module-apt >+This package provides %{summary}. >+ >+%package module-confluence >+Summary: Confluence module for %{name} >+ >+%description module-confluence >+This package provides %{summary}. >+ >+%package module-docbook-simple >+Summary: Simplified DocBook module for %{name} >+ >+%description module-docbook-simple >+This package provides %{summary}. >+ >+%package module-fml >+Summary: FML module for %{name} >+ >+%description module-fml >+This package provides %{summary}. >+ >+%package module-fo >+Summary: FO module for %{name} >+ >+%description module-fo >+This package provides %{summary}. >+ >+%package module-itext >+Summary: iText module for %{name} >+ >+%description module-itext >+This package provides %{summary}. >+ >+%package module-latex >+Summary: Latex module for %{name} >+ >+%description module-latex >+This package provides %{summary}. >+ >+%package module-rtf >+Summary: RTF module for %{name} >+ >+%description module-rtf >+This package provides %{summary}. >+ >+%package modules >+Summary: Doxia modules for several markup languages. >+ >+%description modules >+This package provides %{summary}. >+ >+%package module-twiki >+Summary: TWiki module for %{name} >+ >+%description module-twiki >+This package provides %{summary}. >+ >+%package module-xdoc >+Summary: XDoc module for %{name} >+ >+%description module-xdoc >+This package provides %{summary}. >+ >+%package module-xhtml >+Summary: XHTML module for %{name} >+ >+%description module-xhtml >+This package provides %{summary}. >+ >+%package sink-api >+Summary: Sink-api module for %{name} >+ >+%description sink-api >+This package provides %{summary}. >+ >+%package test-docs >+Summary: Test-docs module for %{name} >+ >+%description test-docs >+This package provides %{summary}. >+ > %package javadoc >-Summary: Javadoc for %{name} >-Group: Documentation >+Summary: Javadoc for %{name} >+Group: Documentation > > %description javadoc > API documentation for %{name}. > >+ > %prep > %setup -q -n doxia-%{version} > %patch0 -p1 >@@ -151,69 +238,58 @@ API documentation for %{name}. > %build > # tests disabled because some use old plexus-container and don't work > # with new >-mvn-rpmbuild \ >- -e \ >- -Dmaven.test.skip=true \ >- install javadoc:aggregate >+%mvn_build -f -s > > %install >-# jars/poms >-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} >-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} >+%mvn_install >+ >+ >+%files -f .mfiles-doxia >+%doc LICENSE NOTICE >+%files book -f .mfiles-doxia-book >+%doc LICENSE NOTICE >+%files core -f .mfiles-doxia-core >+%doc LICENSE NOTICE >+%files logging-api -f .mfiles-doxia-logging-api >+%doc LICENSE NOTICE >+%files maven-plugin -f .mfiles-doxia-maven-plugin >+%doc LICENSE NOTICE >+%files module-apt -f .mfiles-doxia-module-apt >+%doc LICENSE NOTICE >+%files module-confluence -f .mfiles-doxia-module-confluence >+%doc LICENSE NOTICE >+%files module-docbook-simple -f .mfiles-doxia-module-docbook-simple >+%doc LICENSE NOTICE >+%files module-fml -f .mfiles-doxia-module-fml >+%doc LICENSE NOTICE >+%files module-fo -f .mfiles-doxia-module-fo >+%doc LICENSE NOTICE >+%files module-itext -f .mfiles-doxia-module-itext >+%doc LICENSE NOTICE >+%files module-latex -f .mfiles-doxia-module-latex >+%doc LICENSE NOTICE >+%files module-rtf -f .mfiles-doxia-module-rtf >+%doc LICENSE NOTICE >+%files modules -f .mfiles-doxia-modules >+%doc LICENSE NOTICE >+%files module-twiki -f .mfiles-doxia-module-twiki >+%doc LICENSE NOTICE >+%files module-xdoc -f .mfiles-doxia-module-xdoc >+%doc LICENSE NOTICE >+%files module-xhtml -f .mfiles-doxia-module-xhtml >+%doc LICENSE NOTICE >+%files sink-api -f .mfiles-doxia-sink-api >+%doc LICENSE NOTICE >+%files test-docs -f .mfiles-doxia-test-docs >+%doc LICENSE NOTICE >+%files javadoc -f .mfiles-javadoc >+%doc LICENSE NOTICE > >-for targetdir in `find -type d -name target`; do >- >- targetdir=`echo $targetdir | sed -e s:^\./::g` >- >- modulename=`echo $targetdir | awk -F / '{print $(NF-1)}'` >- strippedmodulename=`echo $modulename | sed -e s:^doxia-::g` >- >- # Skip parent pom >- if [ ! -z $strippedmodulename ]; then >- cp -p $targetdir/../pom.xml \ >- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$strippedmodulename.pom >- >- fi >- >- # Does the module have a jar? >- if [ -f $targetdir/$modulename-%{version}.jar ]; then >- cp -p $targetdir/$modulename-%{version}.jar \ >- $RPM_BUILD_ROOT%{_javadir}/%{name}/$strippedmodulename.jar >- %add_maven_depmap JPP.%{name}-$strippedmodulename.pom %{name}/$strippedmodulename.jar >- else >- %add_maven_depmap JPP.%{name}-$strippedmodulename.pom >- fi >- >-done >- >-# Install parent pom >-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-doxia-doxia.pom >-%add_maven_depmap JPP.maven-doxia-doxia.pom >-install -pm 644 doxia-modules/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-doxia-modules.pom >-%add_maven_depmap JPP.maven-doxia-modules.pom >- >-install -d -m 0755 %{buildroot}/%{_datadir}/maven2/lib >-ln -s %{_javadir}/maven-doxia/logging-api.jar $RPM_BUILD_ROOT/%{_datadir}/maven2/lib/maven-doxia_logging-api.jar >- >-# javadoc (all javadocs are contained in the main module docs dir used below) >-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} >-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} >- >-%pre javadoc >-# workaround for rpm bug, can be removed in F-17 >-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ >-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : >- >-%files >-%{_javadir}/%{name} >-%{_mavenpomdir}/* >-%{_mavendepmapfragdir}/%{name} >-%{_datadir}/maven2/lib/* >- >-%files javadoc >-%doc %{_javadocdir}/%{name} > > %changelog >+* Wed Dec 19 2012 Michal Srb <msrb@redhat.com> >+- Splitted into multiple subpackages (Resolves: #888710) >+ > * Mon Dec 10 2012 Michal Srb <msrb@redhat.com> - 0:1.2-5 > - Migrated to plexus-components-component-default (Resolves: #878553) > - Removed custom depmap and its occurrence in spec file >-- >1.8.0.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 888710
:
666132
| 666156