rpms/maven2/devel maven2-bash-completion, NONE, 1.1 maven2.spec, 1.26, 1.27

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Sep 2 09:04:08 UTC 2009


Author: akurtakov

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1242/devel

Modified Files:
	maven2.spec 
Added Files:
	maven2-bash-completion 
Log Message:
- Add bash-completion.
- Drop gcj-support. Drops 1170 lines.
- Fix dependencies for the following plugins: changes, eclipse, idea.


--- NEW FILE maven2-bash-completion ---
_m2_make_goals()
{
  plugin=$1
  mojos=$2
  for mojo in $mojos
  do
    export goals="$goals $plugin:$mojo"
  done
}

_m2_complete()
{
  local cur goals

  COMPREPLY=()
  cur=${COMP_WORDS[COMP_CWORD]}
  goals='clean compile test install package deploy site'
  goals=$goals _m2_make_goals "eclipse" "eclipse"
  goals=$goals _m2_make_goals "idea" "idea"
  goals=$goals _m2_make_goals "assembly" "assembly"
  goals=$goals _m2_make_goals "plexus" "app bundle-application bundle-runtime descriptor runtime service"
  cur=`echo $cur | sed 's/\\\\//g'`
  COMPREPLY=($(compgen -W "${goals}" ${cur} | sed 's/\\\\//g') )
}

complete -F _m2_complete -o filenames mvn
complete -F _m2_complete -o filenames mvn-jpp


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- maven2.spec	1 Sep 2009 19:30:11 -0000	1.26
+++ maven2.spec	2 Sep 2009 09:04:08 -0000	1.27
@@ -28,8 +28,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support 0
-
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 
 %define with_bootstrap 0
@@ -46,7 +44,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -102,6 +100,7 @@ Source14:       %{name}-empty-dep.jar
 Source15:       %{name}-jpp-script
 Source16:       %{name}-jpp-readme.html
 Source17:       %{name}-versionless-depmap.xml
+Source18:       %{name}-bash-completion
 
 Patch0:         maven2-addjdomtobootstrappath.patch
 Patch1:         %{name}-jpprepolayout.patch
@@ -121,7 +120,7 @@ Patch15:        %{name}-plugins-javadoc-
 # This plugin can't cope with a JAR without a JDK version on it
 Patch16:        %{name}-plugins-project-info-reports-jdkversion.patch
 Patch17:        %{name}-MNG-3139.patch
-Patch18:	%{name}-plugins-jpprepolayout.patch
+Patch18:        %{name}-plugins-jpprepolayout.patch
 
 BuildRequires:    java-1.6.0-openjdk-devel
 BuildRequires:    jpackage-utils >= 0:1.7.2
@@ -338,15 +337,7 @@ Requires(postun):  jpackage-utils >= 0:1
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
-
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
 
 %description
 Maven is a software project management and comprehension tool. Based on the
@@ -382,12 +373,6 @@ Requires:	plexus-container-default
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-ant
 Generates an Ant build file for the project.
 
@@ -405,12 +390,6 @@ Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-antlr
 Generates sources from an Antlr grammar.
 
@@ -425,12 +404,6 @@ Requires:    	maven-shared-reporting-imp
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-antrun
 Runs a set of ant tasks from a phase of the build.
 
@@ -458,12 +431,6 @@ Requires:       easymock
 Requires:    	saxpath
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-assembly
 Builds an assembly (distribution) of sources and/or binaries.
 
@@ -480,12 +447,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       maven-doxia >= 1.0-0.a9
 Requires:       maven-scm >= 0:1.0-0.b3.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-changelog
 The Maven Changelog Plugin generates reports regarding the recent changes in
 your Software Configuration Management or SCM.
@@ -497,7 +458,6 @@ Group:          Development/Build Tools
 Requires:       maven-doxia
 Requires:       maven-doxia-sitetools >= 1.0
 Requires:    	maven-shared-reporting-impl
-Requires:       glassfish-javamail
 Requires:       plexus-velocity >= 1.1.7
 %else
 Requires:       plexus-velocity >= 1.1.2
@@ -510,12 +470,6 @@ Requires:       plexus-mail-sender
 Requires:       jakarta-commons-lang
 Requires:       velocity
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-changes
 The Maven Changes Plugin is used to inform users of the changes that have
 occured between different releases of your project.
@@ -534,12 +488,6 @@ Requires:       plexus-resources
 Requires:    	maven-shared-reporting-impl
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-checkstyle
 Generates a checkstyle report.
 
@@ -552,12 +500,6 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-clean
 Cleans up files generated during build.
 
@@ -575,12 +517,6 @@ Requires:       plexus-resources
 Requires:       clover
 Requires:    	maven-shared-reporting-impl
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-clover
 Generates a Clover report.
 %endif
@@ -594,12 +530,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       plexus-compiler >= 1.5.1
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-compiler
 Compiles Java sources.
 
@@ -619,13 +549,6 @@ Requires:       maven-shared-dependency-
 Requires:       maven-shared-dependency-tree
 %endif
 
-
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-dependency
 The dependency plugin provides the capability to manipulate artifacts. It can
 copy and/or unpack artifacts from local or remote repositories to a specified
@@ -637,12 +560,6 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-deploy
 Deploys the built artifacts to a remote repository.
 
@@ -653,17 +570,10 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-doap
 The Maven DOAP Plugin generates a Description of a Project (DOAP) file from
 a POM.
 
-
 %package        plugin-docck
 Summary:        DOCCK plugin for maven
 Group:          Development/Build Tools
@@ -680,12 +590,6 @@ Requires:       commons-httpclient
 Requires:       jakarta-commons-logging >= 1.0.4
 Requires:       maven-shared-file-management >= 1.0-4
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-docck
 The Maven DOCCK Plugin checks that a project complies with the
 Plugin Documentation Standard.
@@ -703,12 +607,6 @@ Requires:       maven-shared-verifier
 %endif
 Requires:       xmlunit
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-ear
 Generates an EAR from the current project.
 
@@ -725,18 +623,11 @@ Requires:       jaxen >= 1.1
 Requires:    	saxpath
 Requires:       plexus-interactivity >= 1.0
 %if %{without_bootstrap}
-Requires:       jmock >= 1.0.1
 Requires:	maven-shared-plugin-testing-tools
 Requires:	maven-shared-test-tools
 %endif
 Requires:       aqute-bndlib
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-eclipse
 Generates an Eclipse project file for the current project.
 
@@ -747,12 +638,6 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-ejb
 Builds an EJB (and optional client) from the current project.
 
@@ -769,12 +654,6 @@ Requires:       maven-enforcer-rule-api
 Requires:       plexus-utils
 Requires:       bsh
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-enforcer
 The Maven Enforcer Plugin provides goals to control certain environmental
 constraints such as Maven Version, JDK version, and OS family.
@@ -790,12 +669,6 @@ Requires:       plexus-utils
 Requires:       jakarta-commons-lang
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-gpg
 The Maven GPG Plugin signs all of the project's attached artifacts with GnuPG.
 
@@ -809,12 +682,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       maven-shared-plugin-tools-api
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-help
 Gets information about the working environment for the project.
 
@@ -827,15 +694,6 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       maven-wagon >= 1.0-0.1.b2
 Requires:       plexus-utils >= 1.2
-%if %{without_bootstrap}
-Requires:       jmock >= 1.0.1
-%endif
-
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
 
 %description    plugin-idea
 Creates/updates an IDEA workspace for the current project
@@ -849,12 +707,6 @@ Requires:       plexus-digest >= 1.0
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-install
 Installs the built artifact into the local repository.
 
@@ -871,12 +723,6 @@ Requires:	maven-shared-io
 %endif
 Requires:       bsh
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-invoker
 The Maven Invoker Plugin is used to run a set of Maven projects and makes
 sure that each project execution is successful, and optionally verifies
@@ -893,12 +739,6 @@ Requires:       maven-shared-archiver >=
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-jar
 Builds a JAR from the current project.
 
@@ -918,12 +758,6 @@ Requires:       plexus-utils >= 1.2
 Requires:    	maven-shared-reporting-impl
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-javadoc
 Generates Javadoc for the project.
 
@@ -940,12 +774,6 @@ Requires:       junit >= 3.8.2
 Requires:       maven-shared-model-converter
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-one
 A plugin for interacting with legacy Maven 1.x repositories and builds.
 
@@ -964,12 +792,6 @@ Requires:       maven-doxia >= 1.0-0.a9
 Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-plugin
 Creates a Maven plugin descriptor for any Mojo's found in the source tree,
 to include in the JAR.
@@ -989,12 +811,6 @@ Requires:       xom
 Requires:    	maven-shared-reporting-impl
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-pmd
 Generates a PMD report.
 
@@ -1017,12 +833,6 @@ Requires:       maven-wagon
 Requires:       maven-scm >= 0:1.0-0.b3.2
 Requires:       maven-doxia >= 1.0-0.a9
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-project-info-reports
 Generates standard project reports.
 
@@ -1032,12 +842,6 @@ Group:          Development/Build Tools
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-rar
 Builds a RAR from the current project.
 
@@ -1057,12 +861,6 @@ Requires:       maven-shared-downloader
 Requires:       plexus-resources
 %endif
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-remote-resources
 The Maven Remote Resources Plugin is used to retrieve JARs of resources
 from remote repositories, processes those resources, and incorporate them
@@ -1076,12 +874,6 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-archiver >= 1.0
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-repository
 Plugin to help with repository-based tasks.
 
@@ -1093,12 +885,6 @@ Requires:       plexus-utils >= 1.2
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-resources
 Copies the resources to the output directory for including in the JAR.
 
@@ -1113,12 +899,6 @@ Requires:       maven-doxia-sitetools >=
 %endif
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-site
 Generates a site for the current project.
 
@@ -1132,12 +912,6 @@ Requires:       plexus-utils >= 1.2
 Requires:       plexus-container-default >= 1.0
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-source
 Builds a JAR of sources for use in IDEs and distribution to the repository.
 
@@ -1150,16 +924,9 @@ Requires:       maven-wagon
 Requires:       plexus-utils
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-stage
 Maven Stage Plugin copies artifacts from one repository to another.
 
-
 %package        plugin-verifier
 Summary:        Verifier plugin for maven
 Group:          Development/Build Tools
@@ -1171,12 +938,6 @@ Requires:       modello >= 1.0-0.a8.3
 %endif
 Requires:       plexus-utils >= 1.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-verifier
 Useful for integration tests - verifies the existence of certain conditions.
 
@@ -1188,12 +949,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 Requires:       plexus-utils >= 1.2
 Requires:       junit >= 3.8.2
 
-%if %{gcj_support}
-BuildRequires:       java-gcj-compat-devel
-Requires(post):      java-gcj-compat
-Requires(postun):    java-gcj-compat
-%endif
-
 %description    plugin-war
 Builds a WAR from the current project.
 
@@ -1693,9 +1448,10 @@ mv m2_repo/repository/JPP $RPM_BUILD_ROO
 rmdir -p m2_repo/repository
 %endif
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+# Install bash-completion support
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/bash_completion.d
+%{__cp} -a %{SOURCE18} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1733,13 +1489,6 @@ build-jar-repository -s -p %{_datadir}/%
 
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 # We create links in %post in the dir's below. rm -rf them.
 %preun -n %{name}
 [ $1 = 0 ] || exit 0
@@ -1753,607 +1502,6 @@ rm -rf %{_datadir}/%{name}/core/*
 if [ -d %{_javadir}/%{name} ] ; then rmdir --ignore-fail-on-non-empty %{_javadir}/%{name} >& /dev/null; fi
 %update_maven_depmap
 
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-source
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-source
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{NONFREE}
-%if %{gcj_support}
-%post plugin-clover
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-clover
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-%endif
-
-%if %{gcj_support}
-%post plugin-ejb
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-ejb
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-repository
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-repository
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-pmd
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-pmd
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-idea
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-idea
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-site
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-site
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-plugin
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-plugin
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-one
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-one
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-eclipse
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-eclipse
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-ear
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-ear
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-project-info-reports
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-project-info-reports
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-antlr
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-antlr
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-clean
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-clean
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-rar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-rar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-jar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-jar
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-checkstyle
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-checkstyle
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-ant
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-ant
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-antrun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-antrun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-help
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-help
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-verifier
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-verifier
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-compiler
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-compiler
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-install
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-install
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-javadoc
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-javadoc
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-assembly
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-assembly
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-deploy
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-deploy
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-dependency
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-dependency
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-changelog
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-changelog
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-changes
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-changes
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-doap
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-doap
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-docck
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-docck
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-enforcer
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-enforcer
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-gpg
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-gpg
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-invoker
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-invoker
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-remote-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-remote-resources
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%post plugin-stage
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun plugin-stage
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files -n %{name}
 %defattr(-,root,root,-)
 %doc %{name}/maven-core/*.txt
@@ -2375,122 +1523,11 @@ fi
 %{_datadir}/%{name}/repository
 %{_mavendepmapfragdir}
 %{_javadir}/%{name}
+%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
 
 %if %{with_bootstrap}
 %{_datadir}/%{name}/bootstrap_repo
 %endif
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/artifact-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/artifact-manager-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/artifact-test-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/core-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/error-diagnostics-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-%{version}-uber.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/model-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/model-v3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/monitor-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-api-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-descriptor-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-parameter-documenter-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-registry-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/profile-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/project-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/reporting-api-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-metadata-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/script-ant-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/script-beanshell-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/settings-%{version}.jar.*
-
-%if %{with_bootstrap}
-%attr(-,root,root) %{_libdir}/gcj/maven2/asm3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/backport-util-concurrent.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/beanshell.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/bndlib.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/book.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/booter.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/cdc.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/classworlds.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/common-artifact-filters.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/decoration-model.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/digest.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/doc-renderer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/file-management.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/geronimo-j2ee-1.4-apis.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/geronimo-javamail-1.3.1-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/impl.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/io.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/jar.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/java.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/junit.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/mail-sender-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/mail-sender-javamail.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/mail-sender-simple.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/manager-plexus.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-archiver.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-dependency-analyzer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-dependency-tree.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-downloader.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-doxia_core.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-doxia_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-embedder.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-enforcer-rule-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-invoker.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-model-converter.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-plugin-testing-harness.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-plugin-testing-tools.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-plugin-tools_api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-scm_api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-surefire_api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-surefire_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-test-tools.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven-verifier.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/maven2-plugin-shade.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/modello_core.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/modello_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-apt.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-confluence.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-docbook-simple.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-fml.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-itext.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-latex.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-rtf.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-twiki.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-xdoc.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/module-xhtml.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plexus_maven-plugin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-jdom.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-jpox.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-prevayler.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-store.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xdoc.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xml.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xpp3.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/plugin-xsd.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/pmd.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-bazaar.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-clearcase.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-cvs-commons.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-cvsexe.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-cvsjava.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-hg.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-local.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-perforce.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-starteam.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-svn-commons.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-svnexe.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-synergy.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/provider-vss.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/repository-builder.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/resources.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/saxpath.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/sink-api.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/site-renderer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/utils.jar.*
-%attr(-,root,root) %{_libdir}/gcj/maven2/velocity.jar.*
-%endif
-
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -2505,94 +1542,46 @@ fi
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/ant-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-plugin*.jar.*
-%endif
-
 %files plugin-antlr
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/antlr-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/antlr-plugin*.jar.*
-%endif
-
 %files plugin-antrun
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/antrun-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/antrun-plugin*.jar.*
-%endif
-
 %files plugin-assembly
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/assembly-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/assembly-plugin*.jar.*
-%endif
-
 %files plugin-changelog
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/changelog-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/changelog-plugin*.jar.*
-%endif
-
 %files plugin-changes
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/changes-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/changes-plugin*.jar.*
-%endif
-
 %files plugin-checkstyle
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/checkstyle-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/checkstyle-plugin*.jar.*
-%endif
-
 %files plugin-clean
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/clean-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/clean-plugin*.jar.*
-%endif
-
 %if %{NONFREE}
 %files plugin-clover
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/clover-plugin*.jar
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/clover-plugin*.jar.*
-%endif
 %endif
 
 %files plugin-compiler
@@ -2600,312 +1589,153 @@ fi
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/compiler-plugin*.jar
 
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/compiler-plugin*.jar.*
-%endif
-
 %files plugin-dependency
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/dependency-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/dependency-plugin*.jar.*
-%endif
-
 %files plugin-deploy
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/deploy-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/deploy-plugin*.jar.*
-%endif
-
 %files plugin-doap
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/doap-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/doap-plugin*.jar.*
-%endif
-
-
 %files plugin-docck
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/docck-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/docck-plugin*.jar.*
-%endif
-
 %files plugin-ear
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/ear-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ear-plugin*.jar.*
-%endif
-
 %files plugin-eclipse
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/eclipse-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/eclipse-plugin*.jar.*
-%endif
-
-
 %files plugin-ejb
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/ejb-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ejb-plugin*.jar.*
-%endif
-
 %files plugin-enforcer
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/enforcer-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/enforcer-plugin*.jar.*
-%endif
-
 %files plugin-gpg
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/gpg-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/gpg-plugin*.jar.*
-%endif
-
-
 %files plugin-help
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/help-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/help-plugin*.jar.*
-%endif
-
-
 %files plugin-idea
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/idea-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/idea-plugin*.jar.*
-%endif
-
-
 %files plugin-install
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/install-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/install-plugin*.jar.*
-%endif
-
 %files plugin-invoker
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/invoker-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/invoker-plugin*.jar.*
-%endif
-
-
 %files plugin-jar
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/jar-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jar-plugin*.jar.*
-%endif
-
-
 %files plugin-javadoc
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/javadoc-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/javadoc-plugin*.jar.*
-%endif
-
-
 %files plugin-one
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/one-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/one-plugin*.jar.*
-%endif
-
-
 %files plugin-plugin
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/plugin-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/plugin-plugin*.jar.*
-%endif
-
-
 %files plugin-pmd
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/pmd-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/pmd-plugin*.jar.*
-%endif
-
-
 %files plugin-project-info-reports
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/project-info-reports-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/project-info-reports-plugin*.jar.*
-%endif
-
-
 %files plugin-rar
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/rar-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/rar-plugin*.jar.*
-%endif
-
-
 %files plugin-remote-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/remote-resources-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/remote-resources-plugin*.jar.*
-%endif
-
-
 %files plugin-repository
 %defattr(-,root,root,-)
 %doc maven2-plugins/maven-repository-plugin/LICENSE.txt
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/repository-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/repository-plugin*.jar.*
-%endif
-
 %files plugin-resources
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/resources-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/resources-plugin*.jar.*
-%endif
-
-
 %files plugin-site
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/site-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/site-plugin*.jar.*
-%endif
-
-
 %files plugin-source
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/source-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/source-plugin*.jar.*
-%endif
-
-
 %files plugin-stage
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/stage-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/stage-plugin*.jar.*
-%endif
-
 %files plugin-verifier
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/verifier-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/verifier-plugin*.jar.*
-%endif
-
-
 %files plugin-war
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/plugins/war-plugin*.jar
 
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/war-plugin*.jar.*
-%endif
-
 %changelog
+* Wed Sep 2 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-3
+- Add bash-completion.
+- Drop gcj-support. Drops 1170 lines.
+- Fix dependencies for the following plugins: changes, eclipse, idea.
+
 * Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-2
 - Build in non-bootstrap mode
 - Change jmock R to easymock for plugin-assembly




More information about the scm-commits mailing list