Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit cdi-api for openSUSE:Factory
Hello community,

here is the log from the commit of package cdi-api for openSUSE:Factory checked
in at 2019-04-08 10:39:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cdi-api (Old)
and /work/SRC/openSUSE:Factory/.cdi-api.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cdi-api"

Mon Apr 8 10:39:55 2019 rev:3 rq:692110 version:1.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/cdi-api/cdi-api.changes 2019-04-04
12:07:44.229421635 +0200
+++ /work/SRC/openSUSE:Factory/.cdi-api.new.3908/cdi-api.changes
2019-04-08 10:40:41.099300524 +0200
@@ -1,0 +2,6 @@
+Sat Apr 6 22:29:10 UTC 2019 - Jan Engelhardt <jengelh@xxxxxxx>
+
+- Use _service instead of custom create-tarball.sh.
+- Avoid double-shipping license file.
+
+-------------------------------------------------------------------

Old:
----
cdi-api-1.2.tar.xz
create-tarball.sh

New:
----
_service
cdi-1.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cdi-api.spec ++++++
--- /var/tmp/diff_new_pack.Ul5qfS/_old 2019-04-08 10:40:41.615300649 +0200
+++ /var/tmp/diff_new_pack.Ul5qfS/_new 2019-04-08 10:40:41.623300651 +0200
@@ -25,10 +25,9 @@
Group: Development/Libraries/Java
URL: http://seamframework.org/Weld
# sh create-tarball.sh %%{version}
-Source0: %{name}-%{version}.tar.xz
+Source0: cdi-%{version}.tar.xz
Source1: %{name}-build.xml
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
-Source3: create-tarball.sh
BuildRequires: ant
BuildRequires: atinject
BuildRequires: fdupes
@@ -51,7 +50,8 @@
This package contains the API documentation for %{name}.

%prep
-%setup -q
+%setup -qn cdi-%{version}
+pushd api/
cp %{SOURCE1} build.xml
cp %{SOURCE2} LICENSE

@@ -59,8 +59,10 @@
%pom_change_dep "javax.interceptor:javax.interceptor-api"
"org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"

%pom_remove_parent
+popd

%build
+pushd api/
mkdir -p lib
build-jar-repository -s lib glassfish-el-api jboss-interceptors-1.2-api
javax.inject
%{ant} \
@@ -68,8 +70,10 @@
-Dtest.skip=true \
%endif
jar javadoc
+popd

%install
+pushd api/
# jar
install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject
@@ -82,14 +86,14 @@
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+popd
%fdupes -s %{buildroot}%{_javadocdir}

-%files -f .mfiles
-%license LICENSE
+%files -f api/.mfiles
+%license api/LICENSE
%{_javadir}/javax.enterprise.inject

%files javadoc
-%license LICENSE
%{_javadocdir}/%{name}

%changelog

++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://github.com/cdi-spec/cdi</param>
<param name="revision">1.2</param>
<param name="versionformat">1.2</param>
<param name="include">api</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>
++++++ cdi-api-1.2.tar.xz -> cdi-1.2.tar.xz ++++++
++++ 20288 lines of diff (skipped)


< Previous Next >
This Thread