[Jpackage-commits] dist/maven-notice-plugin/devel maven-notice-plugin-jpp-depmap.xml, 1.1, 1.2 maven-notice-plugin.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Tue Dec 7 23:21:47 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven-notice-plugin/devel
In directory ryu.zarb.org:/tmp/cvs-serv10262

Modified Files:
	maven-notice-plugin-jpp-depmap.xml maven-notice-plugin.spec 
Log Message:
- release

Index: maven-notice-plugin-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-notice-plugin/devel/maven-notice-plugin-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-notice-plugin-jpp-depmap.xml	7 Dec 2010 22:15:08 -0000	1.1
--- maven-notice-plugin-jpp-depmap.xml	7 Dec 2010 22:21:45 -0000	1.2
***************
*** 1,22 ****
  <dependencies>
- <!--
-   Path to dependency: 
-         1) org.apache.maven.plugins:maven-plugin-plugin:maven-plugin:2.0.8
-         2) org.apache.maven.reporting:maven-reporting-impl:jar:2.0
-         3) commons-validator:commons-validator:jar:1.2.0
- -->
- <!--
-    <dependency>
-       <maven>
-          <groupId>commons-validator</groupId>
-          <artifactId>commons-validator</artifactId>
-          <version>1.2.0</version>
-       </maven>
-       <jpp>
-          <groupId>JPP</groupId>
-          <artifactId>commons-validator</artifactId>
-          <version>1.3.1</version>
-       </jpp>
-    </dependency>
- -->
  </dependencies>
--- 1,2 ----

Index: maven-notice-plugin.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-notice-plugin/devel/maven-notice-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-notice-plugin.spec	7 Dec 2010 22:15:08 -0000	1.1
--- maven-notice-plugin.spec	7 Dec 2010 22:21:45 -0000	1.2
***************
*** 34,38 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without repolib
  
  %define repodir %{_javadir}/repository.jboss.com/org/apache/httpcomponents/%{name}/%{version}-brew
--- 34,38 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with repolib
  
  %define repodir %{_javadir}/repository.jboss.com/org/apache/httpcomponents/%{name}/%{version}-brew
***************
*** 45,49 ****
  Name:           maven-notice-plugin
  Version:        0.0.2
! Release:        0.1%{?dist}
  Epoch:          0
  Summary:        Maven NOTICE and LICENSE plugin
--- 45,49 ----
  Name:           maven-notice-plugin
  Version:        0.0.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Maven NOTICE and LICENSE plugin
***************
*** 133,172 ****
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jars
! mkdir -p $RPM_BUILD_ROOT%{_javadir}
! mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -s ${jar} `/bin/echo $jar | sed "s|-%{version}||g"`; done)
  
  # pom
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.apache.httpcomponents maven-notice-plugin %{namedversion} JPP %{name}
  
  %if 0
  # javadoc
! mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  %endif
  
  %if %with repolib
! mkdir -p $RPM_BUILD_ROOT%{repodir}
! mkdir -p $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml
  tag=`echo %{namedversion}-brew`
! sed -i "s/@VERSION@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
  tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! mkdir -p $RPM_BUILD_ROOT%{repodirsrc}
! cp -p %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p %{PATCH0} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/%{name}.jar
! cp -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom $RPM_BUILD_ROOT%{repodirlib}/%{name}.pom
  %endif
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %post
--- 133,172 ----
  
  %install
! rm -rf %{buildroot}
  
  # jars
! mkdir -p %{buildroot}%{_javadir}
! mkdir -p %{buildroot}%{_datadir}/maven2/poms
! install -p -m 644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -s ${jar} `/bin/echo $jar | sed "s|-%{version}||g"`; done)
  
  # pom
! install -p -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.apache.httpcomponents maven-notice-plugin %{namedversion} JPP %{name}
  
  %if 0
  # javadoc
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  %endif
  
  %if %with repolib
! mkdir -p %{buildroot}%{repodir}
! mkdir -p %{buildroot}%{repodirlib}
! install -p -m 644 %{SOURCE4} %{buildroot}%{repodir}/component-info.xml
  tag=`echo %{namedversion}-brew`
! sed -i "s/@VERSION@/$tag/g" %{buildroot}%{repodir}/component-info.xml
  tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
! mkdir -p %{buildroot}%{repodirsrc}
! cp -p %{SOURCE0} %{buildroot}%{repodirsrc}
! cp -p %{PATCH0} %{buildroot}%{repodirsrc}
! cp -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{name}.jar
! cp -p %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom %{buildroot}%{repodirlib}/%{name}.pom
  %endif
  
  %clean
! rm -rf %{buildroot}
  
  %post
***************
*** 198,201 ****
  
  %changelog
! * Mon Dec 06 2010 David Walluck <dwalluck at redhat.com> 0:0.0.2-0.1
  - release
--- 198,201 ----
  
  %changelog
! * Tue Dec 07 2010 David Walluck <dwalluck at redhat.com> 0:0.0.2-1
  - release




More information about the JPackage-commits mailing list