Mailinglist Archive: opensuse-commit (1214 mails)
| < Previous | Next > |
commit xdoclet for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 07 Aug 2009 22:48:06 +0200
- Message-id: <20090807204806.7F4CC637D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xdoclet for openSUSE:Factory
checked in at Fri Aug 7 22:48:06 CEST 2009.
--------
--- xdoclet/xdoclet.changes 2009-06-04 15:18:18.000000000 +0200
+++ xdoclet/xdoclet.changes 2009-08-05 11:28:28.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 3 14:51:32 UTC 2009 - mvyskocil@xxxxxxx
+
+- Removed -repolib subpackage
+- Use tar.bz2 instead of tar.gz
+- Removed a version from mockobjects Requires
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xdoclet-modules-objectweb-4.6.tgz
xdoclet-src-1.2.3.tgz
New:
----
xdoclet-modules-objectweb-4.6.tar.bz2
xdoclet-src-1.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdoclet.spec ++++++
--- /var/tmp/diff_new_pack.WZh2mv/_old 2009-08-07 22:44:58.000000000 +0200
+++ /var/tmp/diff_new_pack.WZh2mv/_new 2009-08-07 22:44:58.000000000 +0200
@@ -38,14 +38,14 @@
Name: xdoclet
Version: 1.2.3
-Release: 1
+Release: 3
Summary: XDoclet Attribute Orientated Programming Framework
# BSD-style, see
<http://xdoclet.sourceforge.net/xdoclet/licenses/xdoclet-license.html>
License: BSD
Group: Development/Libraries/Java
Url: http://xdoclet.sourceforge.net
-Source0: %{name}-src-%{version}.tgz
-Source1: %{name}-modules-objectweb-4.6.tgz
+Source0: %{name}-src-%{version}.tar.bz2
+Source1: %{name}-modules-objectweb-4.6.tar.bz2
Source2: %{name}-component-info.xml
Patch0: xdoclet-build_xml.patch
Patch1: xdoclet-XDocletModulesEjbMessages.patch
@@ -73,20 +73,20 @@
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-net
BuildRequires: log4j
-BuildRequires: mockobjects >= 0.09-17
+BuildRequires: mockobjects
BuildRequires: struts
BuildRequires: velocity
BuildRequires: xalan-j2 >= 2.7.0
BuildRequires: xml-commons-apis
BuildRequires: xjavadoc >= 1.1
-%if %{with_repolib}
-BuildRequires: xjavadoc-repolib >= 1.1
-%endif
+#%if %{with_repolib}
+#BuildRequires: xjavadoc-repolib >= 1.1
+#%endif
Requires: bsf
Requires: jakarta-commons-collections
Requires: jakarta-commons-logging
Requires: log4j
-Requires: mockobjects >= 0.09-17
+Requires: mockobjects
Requires: velocity
Requires: xalan-j2 >= 2.7.0
Requires: xml-commons-apis
@@ -115,20 +115,9 @@
Group: Development/Libraries/Java
%description manual
-This package contains XDoclet documentation.
+This package contains XDoclet documentation
-%if %{with_repolib}
-%package repolib
-License: BSD
-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
%prep
%setup -q
@@ -137,7 +126,7 @@
# FIXME: (dwalluck) use %%setup here
pushd modules
mv objectweb objectweb.orig
-tar xzf %{SOURCE1}
+tar xf %{SOURCE1}
popd
for j in xjavadoc-1.1 jrefactory javacc junit bsf commons-collections
commons-logging log4j velocity xalan-j2 xjavadoc xml-commons-apis
mockobjects-core; do
ln -s $(build-classpath $j) lib
@@ -187,26 +176,26 @@
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%if %{with_repolib}
- install -d -m 755 $RPM_BUILD_ROOT%{repodir}
- install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
- install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{repodir}/component-info.xml
- install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
- install -m 0644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
- install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
- install -m 0644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
- install -m 0644 %{PATCH5} $RPM_BUILD_ROOT%{repodirsrc}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-jmx-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-web-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-java-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-portlet-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-jboss-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p %{repo}/xjavadoc/1.1-brew/lib/xjavadoc.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-hibernate-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-ejb-module.jar
$RPM_BUILD_ROOT%{repodirlib}
- cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-xdoclet-module.jar
$RPM_BUILD_ROOT%{repodirlib}
-%endif
+#%if %{with_repolib}
+# install -d -m 755 $RPM_BUILD_ROOT%{repodir}
+# install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
+# install -m 0644 %{SOURCE2}
$RPM_BUILD_ROOT%{repodir}/component-info.xml
+# install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
+# install -m 0644 %{PATCH1} $RPM_BUILD_ROOT%{repodirsrc}
+# install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
+# install -m 0644 %{PATCH2} $RPM_BUILD_ROOT%{repodirsrc}
+# install -m 0644 %{PATCH5} $RPM_BUILD_ROOT%{repodirsrc}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-jmx-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-web-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-java-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-portlet-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-jboss-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p %{repo}/xjavadoc/1.1-brew/lib/xjavadoc.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-hibernate-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-ejb-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+# cp -p $RPM_BUILD_ROOT%{_javadir}/xdoclet/xdoclet-xdoclet-module.jar
$RPM_BUILD_ROOT%{repodirlib}
+#%endif
export NO_BRP_CHECK_BYTECODE_VERSION=true
%clean
@@ -232,13 +221,12 @@
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}
-%if %{with_repolib}
-
-%files repolib
-%defattr(0644,root,root,0755)
-%{repodir}
-%dir %{_javadir}/repository.jboss.com/xdoclet
-%dir %{_javadir}/repository.jboss.com
-%endif
+#%if %{with_repolib}
+#%files repolib
+#%defattr(0644,root,root,0755)
+#%{repodir}
+#%dir %{_javadir}/repository.jboss.com/xdoclet
+#%dir %{_javadir}/repository.jboss.com
+#%endif
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |