Hello community,
here is the log from the commit of package jakarta-commons-fileupload for
openSUSE:Factory checked in at 2014-07-16 16:49:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-fileupload (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-fileupload.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-fileupload"
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-fileupload/jakarta-commons-fileupload.changes
2014-06-30 22:49:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-fileupload.new/jakarta-commons-fileupload.changes
2014-07-16 16:49:57.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jul 8 09:18:04 UTC 2014 - [email protected]
+
+- Not needed condition.
+
+-------------------------------------------------------------------
+Tue Jul 8 09:16:56 UTC 2014 - [email protected]
+
+- Cleanup with spec-cleaner and fix build on sle11 properly.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-fileupload.spec ++++++
--- /var/tmp/diff_new_pack.BPPt8g/_old 2014-07-16 16:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.BPPt8g/_new 2014-07-16 16:49:58.000000000 +0200
@@ -14,12 +14,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# icecream 0
%define base_name fileupload
%define short_name commons-%{base_name}
-
Name: jakarta-commons-fileupload
Version: 1.1.1
Release: 0
@@ -35,25 +33,23 @@
Patch2: jakarta-commons-fileupload-CVE-2013-2186.patch
#PATCH-FIX-UPSTREAM: bnc#862781
Patch3:
jakarta-commons-fileupload-CVE-2014-0050-DOS-buffer-overflow.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArch: noarch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: jakarta-commons-io
+BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: junit >= 3.8.1
BuildRequires: portlet-1.0-api
BuildRequires: servletapi5
-BuildRequires: xerces-j2-xml-apis
-%if %defined suse_version
-BuildRequires: java-devel
BuildRequires: unzip
-%endif
+BuildRequires: xerces-j2-xml-apis
Requires: javapackages-tools
Requires: servletapi5
# FIXME: correct on update of fileuploads
Provides: %{short_name} = 1.1.2
Obsoletes: %{short_name} <= 1.1.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
The javax.servlet package lacks support for RFC 1867, HTML file upload.
@@ -62,12 +58,11 @@
classes to read multipart/form-data within a
javax.servlet.http.HttpServletRequest.
-
-
%package javadoc
-PreReq: coreutils
Summary: Javadoc for jakarta-commons-fileupload
Group: Development/Libraries/Java
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq: coreutils
%description javadoc
The javax.servlet package lacks support for rfc 1867, html file upload.
@@ -79,13 +74,11 @@
This package contains the javadoc documentation for the Jakarta Commons
Fileupload Package.
-
-
%prep
%setup -q -n %{short_name}-%{version}
%patch0 -b .build.xml
-%patch1 -p0 -b .servletapi5
-%patch2 -p0
+%patch1 -b .servletapi5
+%patch2
%patch3 -p1
# -----------------------------------------------------------------------------
@@ -93,37 +86,32 @@
export CLASSPATH="$(build-classpath commons-io junit portlet-1.0-api \
servletapi5
xerces-j2-xml-apis):${PWD}/target/classes:${PWD}/target/test-classes"
ant \
+ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-Dbuild.sysclasspath=only \
-Dfinal.name=%{name}-%{version} \
-Dservletapi.javadoc=%{_javadocdir}/servletapi5 \
dist
-# -----------------------------------------------------------------------------
%install
-%if 0%{?suse_version} == 1110
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-%endif
# jars
-%{__mkdir} -p $RPM_BUILD_ROOT%{_javadir}
-%{__cp} -p dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
+cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}
(
- cd $RPM_BUILD_ROOT%{_javadir} && \
+ cd %{buildroot}%{_javadir} && \
for jar in *-%{version}*; do
- %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|jakarta-||g"`
+ ln -s -f ${jar} `echo $jar | sed "s|jakarta-||g"`
done
)
(
- cd $RPM_BUILD_ROOT%{_javadir} && \
+ cd %{buildroot}%{_javadir} && \
for jar in *-%{version}*; do
- %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|-%{version}||g"`
+ ln -s -f ${jar} `echo $jar | sed "s|-%{version}||g"`
done
)
# javadoc
-%{__mkdir} -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%{__cp} -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# -----------------------------------------------------------------------------
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
