Hello community,
here is the log from the commit of package apache-commons-httpclient for
openSUSE:Factory checked in at 2014-07-13 17:15:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-httpclient (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-httpclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-httpclient"
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-httpclient/apache-commons-httpclient.changes
2014-04-15 07:37:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-httpclient.new/apache-commons-httpclient.changes
2014-07-13 17:15:26.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 8 08:23:35 UTC 2014 - [email protected]
+
+- Redo the bytcode disabling properly.
+- Cleanup with spec-cleaner
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-httpclient.spec ++++++
--- /var/tmp/diff_new_pack.ZK4sZ2/_old 2014-07-13 17:15:27.000000000 +0200
+++ /var/tmp/diff_new_pack.ZK4sZ2/_new 2014-07-13 17:15:27.000000000 +0200
@@ -17,7 +17,6 @@
%define short_name commons-httpclient
-
Name: apache-commons-httpclient
Version: 3.1
Release: 0
@@ -25,8 +24,7 @@
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://hc.apache.org/httpclient-3.x/
-#Source0:
http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-Source0: commons-httpclient-%{version}-src.tar.gz
+Source0:
http://www.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-%{version}-src.tar.gz
Patch0: %{name}-disablecryptotests.patch
# Add OSGi MANIFEST.MF bits
Patch1: %{name}-addosgimanifest.patch
@@ -34,25 +32,21 @@
#PATCH-FIX-UPSTREAM: bnc#803332
#https://issues.apache.org/jira/secure/attachment/12560251/CVE-2012-5783-2.patch
Patch3: commons-httpclient-CVE-2012-5783-2.patch
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: commons-codec
BuildRequires: commons-logging >= 1.0.3
BuildRequires: java-devel >= 1.6.0
BuildRequires: junit
-
Requires: commons-codec
Requires: commons-logging >= 1.0.3
-
Provides: %{short_name} = %{version}
-
Provides: jakarta-%{short_name} = %{version}
Obsoletes: jakarta-%{short_name} <= 3.1
Provides: jakarta-%{short_name}3 = %{version}
Obsoletes: jakarta-%{short_name}3 <= 3.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Although the java.net package provides basic functionality for
@@ -69,7 +63,6 @@
for distributed communication.
%package javadoc
-PreReq: coreutils
Summary: Developer documentation for apache-commons-httpclient
Group: Development/Libraries/Java
@@ -109,7 +102,7 @@
%patch0
pushd src/conf
-%{__sed} -i 's/\r//' MANIFEST.MF
+sed -i 's/\r//' MANIFEST.MF
%patch1
popd
@@ -126,12 +119,13 @@
rm tempf
popd
-%{__sed} -i 's/\r//' RELEASE_NOTES.txt
-%{__sed} -i 's/\r//' README.txt
-%{__sed} -i 's/\r//' LICENSE.txt
+sed -i 's/\r//' RELEASE_NOTES.txt
+sed -i 's/\r//' README.txt
+sed -i 's/\r//' LICENSE.txt
%build
ant \
+ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-Dbuild.sysclasspath=first \
-Djavadoc.j2sdk.link=%{_javadocdir}/java \
-Djavadoc.logging.link=%{_javadocdir}/apache-commons-logging \
@@ -141,17 +135,12 @@
dist test
%install
-# suppress on SLES
-%if 0%{?suse_version} == 1110
-export NO_BRP_CHECK_BYTECODE_VERSION=true
-%endif
-
# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
cp -p dist/commons-httpclient.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ %{buildroot}%{_javadir}/%{name}.jar
# compat symlink
-pushd $RPM_BUILD_ROOT%{_javadir}
+pushd %{buildroot}%{_javadir}
ln -s apache-commons-httpclient.jar apache-commons-httpclient3.jar
ln -s apache-commons-httpclient.jar commons-httpclient3.jar
ln -s apache-commons-httpclient.jar commons-httpclient.jar
@@ -160,20 +149,17 @@
popd
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-mv dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}
+mv dist/docs/api %{buildroot}%{_javadocdir}/%{name}
# demo
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr src/examples src/contrib $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -pr src/examples src/contrib %{buildroot}%{_datadir}/%{name}
# manual and docs
rm -f dist/docs/{BUILDING,TESTING}.txt
ln -s %{_javadocdir}/%{name} dist/docs/apidocs
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt RELEASE_NOTES.txt
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
