rpms/jakarta-commons-digester/devel commons-digester-1.7-component-info.xml, NONE, 1.1 jakarta-commons-digester.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: vivekl

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3674/devel

Modified Files:
	jakarta-commons-digester.spec 
Added Files:
	commons-digester-1.7-component-info.xml 
Log Message:
auto-import jakarta-commons-digester-1.7-6jpp.el4ep1.1 on branch devel from jakarta-commons-digester-1.7-6jpp.el4ep1.1.src.rpm


--- NEW FILE commons-digester-1.7-component-info.xml ---
<project name="apache-commons-digester">
   <component id="apache-digester"
              licenseType="apache-2.0"
              version="1.7brew"
              projectHome="http://jakarta.apache.org/commons/digester/"
              description="XML to Java object mapping module"
              scm=":ext:cvs.devel.redhat.com:/cvs/dist/jakarta-commons-digester"
              tag="@TAG@">
      <!-- Built using JDK 1.4 -->
      <artifact id="commons-digester.jar"/>
      <export>
         <include input="commons-digester.jar"/>
      </export>
   </component>
</project>


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jakarta-commons-digester.spec	10 Aug 2006 19:45:31 -0000	1.34
+++ jakarta-commons-digester.spec	23 Jan 2007 02:34:44 -0000	1.35
@@ -28,7 +28,17 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
+# If you want repolib package to be built,
+# issue the following: 'rpmbuild --with repolib'
+
+%define _with_repolib 1
+
+%define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0}
+%define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
+
+%define repodir /apache-digester/1.7brew
+%define repodirlib %{repodir}/lib
+%define repodirsrc %{repodir}/src
 
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
@@ -38,12 +48,13 @@
 
 Name:           jakarta-%{short_name}
 Version:        1.7
-Release:        5jpp.1
+Release:        6jpp.el4ep1.1
 Epoch:          0
 Summary:        Jakarta Commons Digester Package
 License:        Apache Software License
 Group:          Development/Libraries/Java
 Source0:        http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz
+Source1:        commons-digester-1.7-component-info.xml
 URL:            http://jakarta.apache.org/commons/digester/
 BuildRequires:  ant
 BuildRequires:  jakarta-commons-beanutils >= 0:1.7
@@ -55,13 +66,13 @@
 BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides:       %{short_name}
-Obsoletes:      %{short_name}
+Provides:       %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes:      %{short_name} < %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -69,6 +80,17 @@
 object mapping package written in the Java language to be distributed
 under the ASF license.
 
+%if %{with_repolib}
+%package        repolib
+Summary:        Artifacts to be uploaded to a repository library.
+Group:          Development/Libraries/Java
+
+%description     repolib
+Artifacts to be uploaded to a repository library.
+This package is not meant to be installed but so its contents
+can be extracted through rpm2cpio
+%endif
+
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
@@ -81,6 +103,10 @@
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
+
+tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
+sed -i "s/@TAG@/$tag/g" %{SOURCE1}
+
 %build
 cp LICENSE.txt ../LICENSE
 
@@ -112,6 +138,16 @@
 %{_bindir}/aot-compile-rpm
 %endif
 
+
+%if %{with_repolib}
+        install -d -m 755 $RPM_BUILD_ROOT%{repodir}
+        install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
+        install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml
+        install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
+        install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
+        cp $RPM_BUILD_ROOT%{_javadir}/commons-digester.jar $RPM_BUILD_ROOT%{repodirlib}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -155,7 +191,28 @@
 %{_javadocdir}/%{name}-%{version}
 %ghost %doc %{_javadocdir}/%{name}
 
+
+%if %{with_repolib}
+%files repolib
+%defattr(-,root,root)
+%{repodir}
+%endif
+
 %changelog
+* Mon Jan 22 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.7-6jpp.el4ep1.1
+- Resynch with JPP release
+- rpmlint clean up
+
+* Tue Jan 16 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.7-5jpp.3
+- Update component-info.xml to add scm and tag attribute instead of a comment
+- Remove the export of a versioned jar
+
+* Tue Jan 9 2007 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.7-5jpp.2
+- Upgrade to latest from JPP and FC6
+- Remove old RHUG specific trigger
+- Add support for conditional build of repolib package
+- Build repolib package by default
+
 * Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:1.7-5jpp.1
 - Merge with upstream version:
  - Add missing requires for javadoc
@@ -227,5 +284,5 @@
 
 * Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.2-1jpp
 - 1.2
-- added short names in %{_javadir}, as does jakarta developpers
+- added short names in _javadir, as does jakarta developpers
 - first jPackage release