rpms/jakarta-commons-modeler/devel .cvsignore, 1.4, 1.5 jakarta-commons-modeler.spec, 1.35, 1.36 sources, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 26 00:25:08 UTC 2007
Author: mwringe
Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14582
Modified Files:
.cvsignore jakarta-commons-modeler.spec sources
Log Message:
Merge with lastest jpp version
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 4 May 2005 11:15:39 -0000 1.4
+++ .cvsignore 26 Apr 2007 00:25:06 -0000 1.5
@@ -1,4 +1 @@
-modeler-1.1-src.tar.gz
-commons-modeler-1.1-src
-i386
-*.src.rpm
+commons-modeler-2.0-src.tar.gz
Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jakarta-commons-modeler.spec 10 Aug 2006 19:40:02 -0000 1.35
+++ jakarta-commons-modeler.spec 26 Apr 2007 00:25:06 -0000 1.36
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -32,139 +32,167 @@
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define base_name modeler
-%define short_name commons-%{base_name}
-%define section free
-
-Name: jakarta-%{short_name}
-Version: 1.1
-Release: 8jpp.1
-Epoch: 0
-Summary: Jakarta Commons Modeler Package
-License: Apache Software License
-Group: Development/Libraries/Java
-Source0: %{base_name}-%{version}-src.tar.gz
-#Patch: %{name}.no-licence.build.patch
-Patch0: %{name}.build.properties.default.patch
-Patch1: %{name}.build.xml.patch
-Url: http://jakarta.apache.org/commons/%{base_name}
-BuildRequires: ant
-BuildRequires: jaxp_parser_impl
-BuildRequires: xml-commons-apis
-BuildRequires: jaxp_transform_impl
-BuildRequires: jmxri
-BuildRequires: junit >= 0:3.7
-BuildRequires: jakarta-commons-beanutils >= 0:1.3
-BuildRequires: jakarta-commons-collections >= 0:2.0
-BuildRequires: jakarta-commons-digester >= 0:1.2
-BuildRequires: jakarta-commons-logging >= 0:1.0
-Requires: jaxp_parser_impl
-Requires: xml-commons-apis
-Requires: jaxp_transform_impl
-Requires: jmxri
-Requires: jakarta-commons-beanutils >= 0:1.3
-Requires: jakarta-commons-collections >= 0:2.0
-Requires: jakarta-commons-digester >= 0:1.2
-Requires: jakarta-commons-logging >= 0:1.0
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
-Provides: %{short_name}
-Obsoletes: %{short_name}
+%define base_name modeler
+%define short_name commons-%{base_name}
+
+Name: jakarta-%{short_name}
+Epoch: 0
+Version: 2.0
+Release: 3jpp.1%{?dist}
+Summary: Model MBeans utilty classes
+Group: Development/Libraries/Java
+License: Apache Software License
+Url: http://jakarta.apache.org/commons/%{base_name}
+Source0: http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/modeler/source/commons-modeler-2.0-src.tar.gz
+Patch0: %{name}.build.properties.default.patch
+Patch1: %{name}.build.xml.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%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
+BuildRequires: ant
+BuildRequires: findutils
+BuildRequires: jakarta-commons-beanutils >= 0:1.3
+BuildRequires: jakarta-commons-collections >= 0:2.0
+BuildRequires: jakarta-commons-digester >= 0:1.2
+BuildRequires: jakarta-commons-logging >= 0:1.0
+BuildRequires: jaxp_parser_impl
+BuildRequires: jaxp_transform_impl
+BuildRequires: jmxri
+BuildRequires: junit >= 0:3.7
+BuildRequires: xml-commons-apis >= 1.3
+Requires: jakarta-commons-beanutils >= 0:1.3
+Requires: jakarta-commons-collections >= 0:2.0
+Requires: jakarta-commons-digester >= 0:1.2
+Requires: jakarta-commons-logging >= 0:1.0
+Requires: jaxp_parser_impl
+Requires: jaxp_transform_impl
+Requires: jmxri
+Requires: xml-commons-apis
+%if ! %{gcj_support}
+BuildArch: noarch
%endif
+Provides: %{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
%description
The Modeler project shall create and maintain a set of Java
-classes to provide the facilities described in the preceeding section, plus
-unit tests and small examples of using these facilities to instrument
-Java classes with Model MBean support.
+classes to provide support for configuring and instantiating Model
+MBeans, plus unit tests and small examples of using these facilities
+to instrument Java classes with Model MBean support.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
+Summary: Javadoc for %{name}
+Group: Development/Documentation
%description javadoc
Javadoc for %{name}.
%prep
-%setup -n %{short_name}-%{version}-src
-#%%patch
+%setup -q -n %{short_name}-%{version}-src
%patch0
%patch1
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+# remove all binary files
+find . \( -name "*.jar" -o -name "*.class" -o -name "*.zip" \) \
+ | xargs %{__rm} -f
+
+
+# fix eol encodings
+%{__sed} -i 's/\r//' xdocs/downloads.xml
+%{__sed} -i 's/\r//' xdocs/cvs-usage.xml
+%{__sed} -i 's/\r//' xdocs/issue-tracking.xml
+%{__sed} -i 's/\r//' LICENSE.txt
+%{__sed} -i 's/\r//' xdocs/navigation.xml
+%{__sed} -i 's/\r//' xdocs/style/project.css
+%{__sed} -i 's/\r//' xdocs/index.xml
+%{__sed} -i 's/\r//' xdocs/building.xml
+%{__sed} -i 's/\r//' NOTICE.txt
+%{__sed} -i 's/\r//' RELEASE-NOTES.txt
%build
export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl jmxri junit commons-beanutils commons-collections commons-digester commons-logging)
-%ant dist
+%{ant} dist
%install
+%{__rm} -rf %{buildroot}
# jars
-%__mkdir_p %{buildroot}%{_javadir}
-%__cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed "s|jakarta-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} `echo $jar| %__sed "s|-%{version}||g"`; done)
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__cp} -a dist/%{short_name}.jar \
+ %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(
+ cd %{buildroot}%{_javadir}
+ for jar in *-%{version}*; do
+ %{__ln_s} ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
+ done
+)
+(
+ cd %{buildroot}%{_javadir}
+ for jar in *-%{version}*; do
+ %{__ln_s} ${jar} `echo $jar | %__sed "s|-%{version}||g"`
+ done
+)
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+(
+ cd %{buildroot}%{_javadocdir}
+ %{__ln_s} %{name}-%{version} %{name}
+)
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
-%__rm -rf %{buildroot}
-
-%post javadoc
-%__rm -f %{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
- %__rm -f %{_javadocdir}/%{name}
-fi
+%{__rm} -rf %{buildroot}
-%post
%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%postun
%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(0644,root,root,0755)
-%doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
%{_javadir}/*
%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-modeler-1.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif
%files javadoc
%defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
-%ghost %dir %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
%changelog
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp.1
+- Merge with lastest jpp version
+
+* Wed Mar 21 2007 Matt Wringe <mwringe at redhat.com> - 0:2.0-3jpp
+- Make provides and obsoletes versioned
+- Fix eol encoding on various files
+
+* Tue Mar 12 2007 Jason Corley <jason.corley at gmail.com> - 0:2.0-2jpp
+- respin to upload to main repo
+- fix rpmlint warnings
+
+* Tue Feb 27 2007 Jason Corley <jason.corley at gmail.com> - 0:2.0-1jpp
+- change copyright text to have current year
+- minor aesthetic cleanups
+- update to 2.0
+
* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:1.1-8jpp.1
- Merge with upstream version:
- Add missing javadoc requires
@@ -221,5 +249,5 @@
* Fri Jun 07 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0-1jpp
- 1.0
-- added short names in %{_javadir}, as does jakarta developpers
+- added short names in %%{_javadir}, as does jakarta developpers
- first jPackage release
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Sep 2004 16:10:26 -0000 1.2
+++ sources 26 Apr 2007 00:25:06 -0000 1.3
@@ -1 +1 @@
-6de043186a348758c845f1a2321e8308 modeler-1.1-src.tar.gz
+43983c66113ddaa9880e4a7ea7d38db4 commons-modeler-2.0-src.tar.gz
More information about the fedora-cvs-commits
mailing list