scm-commits October 2017

scm-commits@lists.fedoraproject.org

1 participants
14460 discussions

sgallagh pushed to nodejs (master). "Update to 8.9.0 (..more)"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 599922b4e5e44f8e6a4bb32a77caeb0a7b949307 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher <sgallagh(a)redhat.com> Date: Oct 31 2017 22:57:55 +0000 Subject: Update to 8.9.0 Drop upstreamed patch Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com> --- diff --git a/.gitignore b/.gitignore index d127522..3da651c 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /node-v8.7.0-stripped.tar.gz /node-v8.8.0-stripped.tar.gz /node-v8.8.1-stripped.tar.gz +/node-v8.9.0-stripped.tar.gz diff --git a/0001-src-fix-http2-debug-build-errors.patch b/0001-src-fix-http2-debug-build-errors.patch deleted file mode 100644 index 4467f27..0000000 --- a/0001-src-fix-http2-debug-build-errors.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 27a4275eb7a52d944b95655fd5afc8b192e95b8c Mon Sep 17 00:00:00 2001 -From: Daniel Bevenius <daniel.bevenius(a)gmail.com> -Date: Tue, 24 Oct 2017 08:34:02 +0200 -Subject: [PATCH] src: fix http2 debug build errors - -Currently building with debug enabled produces the following errors: - -In file included from ../src/node_http2.h:6: -../src/node_http2_core-inl.h:465:18: error: expected ';' after do/while -statement - CHECK_GT(id, 0) - ^ - ; -../src/node_http2_core-inl.h:469:18: error: use of undeclared identifier -'spec' - OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); - ^ -../src/node_http2_core-inl.h:469:34: error: use of undeclared identifier -'spec' - OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); - ^ -../src/node_http2_core-inl.h:469:47: error: use of undeclared identifier -'spec' - OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); - ^ - -This commit adds the missing semicolon to fix the above error. - -../src/node_http2.cc:92:9: error: reference to non-static member -function must be called; did you mean to call - it with no arguments? - CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); - ^~~~~~ -../src/util.h:120:20: note: expanded from macro 'CHECK' - if (UNLIKELY(!(expr))) { -\ - ^~~~ -../src/util.h:107:44: note: expanded from macro 'UNLIKELY' - -For this issue I was not sure what the correct check would be so I've -just commented it out and will update after feedback. - -squash: uncomment check ---- - src/node_http2.cc | 2 +- - src/node_http2_core-inl.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/node_http2.cc b/src/node_http2.cc -index 089423334366c2696b9458ea0aa660ecf3f7ce3e..e10c71e9a84e1ecaf268ef733a2a79ad57c9dc74 100644 ---- a/src/node_http2.cc -+++ b/src/node_http2.cc -@@ -87,11 +87,11 @@ ssize_t Http2Session::OnCallbackPadding(size_t frameLen, - - HandleScope handle_scope(isolate); - Context::Scope context_scope(context); - - #if defined(DEBUG) && DEBUG -- CHECK(object->Has(context, env()->ongetpadding_string()).FromJust()); -+ CHECK(object()->Has(context, env()->ongetpadding_string()).FromJust()); - #endif - - AliasedBuffer<uint32_t, v8::Uint32Array>& buffer = - env()->http2_state()->padding_buffer; - buffer[PADDING_BUF_FRAME_LENGTH] = frameLen; -diff --git a/src/node_http2_core-inl.h b/src/node_http2_core-inl.h -index 5bfe1dc19a949c9d861ad2d7423a91617feb0649..9735e565b2f0e2585a043054da87d1c81e4e3abf 100644 ---- a/src/node_http2_core-inl.h -+++ b/src/node_http2_core-inl.h -@@ -460,11 +460,11 @@ inline void Nghttp2Session::HandlePriorityFrame(const nghttp2_frame* frame) { - // Priority frame stream ID should never be <= 0. nghttp2 handles this - // as an error condition that terminates the session, so we should be - // good here - - #if defined(DEBUG) && DEBUG -- CHECK_GT(id, 0) -+ CHECK_GT(id, 0); - #endif - - nghttp2_priority_spec spec = priority_frame.pri_spec; - OnPriority(id, spec.stream_id, spec.weight, spec.exclusive); - } --- -2.14.2 - diff --git a/nodejs.spec b/nodejs.spec index 160982c..5699a3e 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,8 +21,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 8 -%global nodejs_minor 8 -%global nodejs_patch 1 +%global nodejs_minor 9 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -32,7 +32,7 @@ %global v8_major 6 %global v8_minor 1 %global v8_build 534 -%global v8_patch 42 +%global v8_patch 46 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -67,8 +67,8 @@ # npm - from deps/npm/package.json %global npm_epoch 1 %global npm_major 5 -%global npm_minor 4 -%global npm_patch 2 +%global npm_minor 5 +%global npm_patch 1 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} # In order to avoid needing to keep incrementing the release version for the @@ -111,9 +111,6 @@ Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch # Follow https://bugs.chromium.org/p/v8/issues/detail?id=6939 Patch2: 0001-Fix-aarch64-debug.patch -# From upstream PR: https://github.com/nodejs/node/pull/16432 -Patch3: 0001-src-fix-http2-debug-build-errors.patch - BuildRequires: python2-devel BuildRequires: libicu-devel BuildRequires: zlib-devel @@ -261,7 +258,6 @@ rm -rf deps/icu-small \ deps/zlib %patch2 -p1 -%patch3 -p1 %build # build with debugging symbols and add defines from libuv (#892601) @@ -457,6 +453,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Tue Oct 31 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.9.0-1 +- Update to 8.9.0 +- Drop upstreamed patch + * Thu Oct 26 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.8.1-1 - Update to 8.8.1 to fix a regression diff --git a/sources b/sources index 36cd2ab..edbcff0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v8.8.1-stripped.tar.gz) = 2a8a0888401c73dbd30817c21d2709866dde83b85a5af29df4372268bb25f2721bf4ee3a1321f60687e5b2e03d5ce5b9d6d4da4869ae8b1f393e517bd14853af +SHA512 (node-v8.9.0-stripped.tar.gz) = b7a2aed662eb6b9dd5029f86fde8658092b8834417e7ccc2f80adf399ccbf7b35932f5afd141c8dd88f2e050ea3418997daabcc8237a59e1af6a2238dc7a384b https://src.fedoraproject.org/rpms/nodejs/c/599922b4e5e44f8e6a4bb32a77caeb0…

1 0

allisson pushed to pop-gtk-theme (f26). "Bump 2.2.3.0 release"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 736c42eb153ab1f2bd83db196c5df7a0461afec6 Mon Sep 17 00:00:00 2001 From: Allisson Azevedo <allisson(a)gmail.com> Date: Oct 31 2017 19:45:00 +0000 Subject: Bump 2.2.3.0 release --- diff --git a/.gitignore b/.gitignore index 44049d7..764148f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /2.0.7-0.tar.gz /2.1.2-1.tar.gz +/2.2.3-0.tar.gz diff --git a/pop-gtk-theme.spec b/pop-gtk-theme.spec index 4294b69..0c7ffa9 100644 --- a/pop-gtk-theme.spec +++ b/pop-gtk-theme.spec @@ -1,7 +1,7 @@ -%global release_version 2.1.2-1 +%global release_version 2.2.3-0 Name: pop-gtk-theme -Version: 2.1.2.1 +Version: 2.2.3.0 Release: 1%{?dist} Summary: Version 2 of the Pop GTK+ Theme @@ -61,6 +61,9 @@ chmod 0644 src/gtk-2.0/gtkrc-light %changelog +* Tue Oct 31 2017 Allisson Azevedo <allisson(a)gmail.com> - 2.2.3.0-1 +- Bump 2.2.3.0 release + * Mon Oct 16 2017 Allisson Azevedo <allisson(a)gmail.com> - 2.1.2.1-1 - Bump 2.1.2.1 release diff --git a/sources b/sources index d4dd105..cead292 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2.1.2-1.tar.gz) = 05f4f57287a520b8945594c002bcaab95f7b5e7f181c9c674d099e79bb79534de7ba5207dd9588c88d6d27bef5deedf2eaee81efc09674d38884940c598f8f81 +SHA512 (2.2.3-0.tar.gz) = db7ffb222f0533a856f8f22fc3ec710b7f513b4ba089212da35783f8dfb85d2ae71a672fe981bb12ba108eb71edeb2d191212def9680c251903360b6f4d2a516 https://src.fedoraproject.org/rpms/pop-gtk-theme/c/736c42eb153ab1f2bd83db19…

1 0

allisson pushed to pop-gtk-theme (f26). "Fix autosetup"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 3d59adde11748b9273f7d2febc627eda617e1c27 Mon Sep 17 00:00:00 2001 From: Allisson Azevedo <allisson(a)gmail.com> Date: Oct 31 2017 22:21:45 +0000 Subject: Fix autosetup --- diff --git a/pop-gtk-theme.spec b/pop-gtk-theme.spec index 0c7ffa9..86e358d 100644 --- a/pop-gtk-theme.spec +++ b/pop-gtk-theme.spec @@ -25,10 +25,11 @@ An adaptive Gtk+ theme based on the Flat-Plat GTK+ theme. %prep -%autosetup -n %{name}-%{release_version} +%autosetup -n gtk-theme-%{release_version} %build +find . -type f -name .gitignore -exec rm {} \; chmod 0644 src/index-compact.theme chmod 0644 src/index-dark-compact.theme chmod 0644 src/index-dark.theme https://src.fedoraproject.org/rpms/pop-gtk-theme/c/3d59adde11748b9273f7d2fe…

1 0

allisson pushed to pop-gtk-theme (f27). "Fix autosetup"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

1 0

allisson pushed to pop-gtk-theme (f27). "Bump 2.2.3.0 release"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

1 0

sgallagh uploaded node-v8.9.0-stripped.tar.gz for nodejs
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

b7a2aed662eb6b9dd5029f86fde8658092b8834417e7ccc2f80adf399ccbf7b35932f5afd141c8dd88f2e050ea3418997daabcc8237a59e1af6a2238dc7a384b node-v8.9.0-stripped.tar.gz https://src.fedoraproject.org/lookaside/pkgs/nodejs/node-v8.9.0-stripped.ta…

1 0

allisson pushed to pop-gtk-theme (master). "Fix autosetup"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

1 0

adamwill pushed to fedora-release-notes (f27). "Not shipping release notes with F27 due to not ready in time: see RHBZ#1506052"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 752bcb4a7ac2ed6dda13476c9a63f25fc8ec2b8e Mon Sep 17 00:00:00 2001 From: Adam Williamson <awilliam(a)redhat.com> Date: Oct 31 2017 22:09:52 +0000 Subject: Not shipping release notes with F27 due to not ready in time: see RHBZ#1506052 --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index da214f5..0000000 --- a/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -fedora-release-notes-13.2.tar.gz -/fedora-release-notes-13.95.0.tar.gz -/fedora-release-notes-14.0.0.tar.gz -/fedora-release-notes-14.1.0.tar.gz -/fedora-release-notes-14.1.1.tar.gz -/fedora-release-notes-14.1.2.tar.gz -/fedora-release-notes-14.95.0.tar.gz -/fedora-release-notes-14.96.1.tar.gz -/fedora-release-notes-14.98.0.tar.gz -/fedora-release-notes-15.0.0.tar.gz -/fedora-release-notes-15.1.0.tar.gz -/fedora-release-notes-15.95.0.tar.gz -/fedora-release-notes-16.0.0.tar.gz -/fedora-release-notes-16.1.0.tar.gz -/fedora-release-notes-16.95.0.tar.gz -/fedora-release-notes-16.96.0.tar.gz -/fedora-release-notes-17.0.0.tar.gz -/fedora-release-notes-17.0.1.tar.gz -/fedora-release-notes-17.1.0.tar.gz -/fedora-release-notes-17.95.0.tar.gz -/release-notes-20-0.0.tar.bz2 -/release-notes-20-0.1.tar.bz2 -/release-notes-20-0.2.tar.bz2 -/release-notes-20-0.3.tar.bz2 -/release-notes-20-0.4.tar.bz2 -/fedora-release-notes-20-0.5.src.rpm -/release-notes-20-0.6.tar.bz2 -/release-notes-20-0.8.tar.bz2 -/fedora-release-notes-20-0.9.src.rpm -/release-notes-21-03.tar.bz2 -/release-notes-21-04.tar.bz2 -/release-notes-21.04.tar.bz2 -/release-notes-22.01.tar.bz2 -/release-notes-23.02.tar.bz2 -/release-notes-24.00.tar.bz2 -/release-notes-24.01.tar.bz2 -/release-notes-25.0.tar.gz -/release-notes-25.0-1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..ede022e --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Not shipping release notes with F27 due to not ready in time: see RHBZ#1506052 diff --git a/fedora-release-notes.spec b/fedora-release-notes.spec deleted file mode 100644 index c82da35..0000000 --- a/fedora-release-notes.spec +++ /dev/null @@ -1,581 +0,0 @@ -Name: fedora-release-notes -Version: 25.01 -Release: 3%{?dist} -Summary: Release Notes -# since name of git repo may not be name of package, we define it here to aid reuse. -%global gitname %(echo %{name}|sed -e 's/^fedora-//') -License: CC-BY-SA -URL: https://docs.fedoraproject.org -#Source0: http://git.fedorahosted.org/cgit/docs/release-notes.git/snapshot/%{gitname}… -Source0: https://pagure.io/releases/release-notes/release-notes-25.0-1.tar.gz -BuildArch: noarch -BuildRequires: publican, publican-fedora, desktop-file-utils - -%description -These are the official Release Notes for Fedora %{version}, -written and edited by the Fedora community. For more -information on the Release Notes process or how you can -contribute, refer to the Release Notes HOWTO located at -http://fedoraproject.org/wiki/Docs/Beats/HowTo. - -%prep -%setup -q -n release-notes - -%build -export LANG=en_US.utf8 -desktop-file-edit --set-comment="%{summary} for Fedora %{version}" build/%{name}.desktop -desktop-file-edit --set-icon="%{name}" build/%{name}.desktop -LOCALES=\"en-US\" -for LANGDIR in * ; do - if locale -a|sed -e's/_/-/'|grep -qx ${LANGDIR} - then publican build --langs=${LANGDIR} --formats=html - REALLANG=$(echo "${LANGDIR}"|sed -e 's/-/_/') - mv tmp/${LANGDIR}/html/* tmp/${LANGDIR}/ - rm -rf tmp/${LANGDIR}/{html,xml*} - LOCALES="${LOCALES}, \"${LANGDIR}\"" - sed --in-place "/<\/ul>/i <li><a href='.\/${LANGDIR}\/index.html' \/>${LANGDIR}<\/li>" build/index.html - if [ ${LANGDIR} != en-US ] - then TRANSNAME=$(grep -A1 'msgid "%{summary}"' ${LANGDIR}/Article_Info.po|tail -1|sed -r 's/.*"(.*)".*$/\1/') - TRANSCOMMENT=$(grep -A1 'msgid "%{summary} for Fedora %{version}"' ${LANGDIR}/Article_Info.po |tail -1|sed -r 's/.*"(.*)".*$/\1/') - desktop-file-edit --set-key="Name[${REALLANG}]" --set-value="${TRANSNAME}" build/%{name}.desktop - desktop-file-edit --set-key="Comment[${REALLANG}]" --set-value="${TRANSCOMMENT}" build/%{name}.desktop - fi - fi -done -sed --in-place -e "s/LOCALESTRING/${LOCALES}/" build/index.html -find tmp -name overrides.css -execdir sed -i -e "1 s/^/.producttitle span { color: white; }\n/" {} \; - -cp build/%{name}.desktop build/%{name}.webapp.desktop -desktop-file-edit --set-key=OnlyShowIn --set-value="GNOME;" build/%{name}.webapp.desktop -desktop-file-edit --set-key=NotShowIn --set-value="GNOME;" build/%{name}.desktop -desktop-file-edit --set-key=Exec --set-value="xdg-open file://%{_docdir}/%{name}/index.html" build/%{name}.desktop - -%install -ICONDIR="%{buildroot}%{_datadir}/icons/hicolor/" -cd build -for SZ in icons/* ; do -SZA=${SZ#icons/} -mkdir -p %buildroot}%{_datadir}/icons/hicolor/${SZA}/apps - if [ "${SZA}" == "scalable" ] ; then : - install -m 644 -Dp ${SZ}/apps/fedora-documentation.svg \ - ${ICONDIR}${SZA}/apps/fedora-release-notes.svg - else - install -m 644 -Dp ${SZ}/apps/fedora-documentation.png \ - ${ICONDIR}${SZA}/apps/fedora-release-notes.png - fi -done -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.webapp.desktop - -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi -/usr/bin/update-desktop-database &> /dev/null || : -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%files -%{_datadir}/applications/%{name}.desktop -%{_datadir}/applications/%{name}.webapp.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%doc tmp/* build/index.html - - - -%changelog -* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 25.01-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 25.01-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 8 2016 Nick Bebout <nb(a)fedoraproject.org> - 25.01-1 -- Update for F25 - -* Tue Apr 19 2016 Pete Travis <immanetize(a)fedoraproject.org> - 24.01-1 -- updating prerelease draft for f24 beta - -* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.00-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Nov 09 2015 Pete Travis <immanetize(a)fedoraproject.org> - 24.00-1 -- Provide prelease info for F24 - -* Mon Oct 12 2015 Pete Travis <immanetize(a)fedoraproject.org> - 23.01-1 -- F23 Final Freeze Milestone - -* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 22.01-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Feb 09 2015 Pete Travis <immanetize(a)fedoraproject.org> - 22.01-1 -- Prelease info for F22 - -* Sat Sep 06 2014 Pete Travis <immanetize(a)fedoraproject.org> - 21-04 -- Correcting GNOME desktop file - -* Sun Aug 31 2014 Pete Travis <immanetize(a)fedoraproject.org> - 21-03 -- Correcting path in desktop file - -* Sun Aug 31 2014 Pete Travis <immanetize(a)fedoraproject.org> - 21-02 -- Add GNOME-specific desktop file to launch release notes as webapp - -* Sat Aug 30 2014 Pete Travis <immanetize(a)fedoraproject.org> - 21-01 -- Provide prerelease information only - -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 20-0.10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Dec 12 2013 Pete Travis <me(a)petetravis.com> - 20-0.9 -- minor corrections - -* Thu Dec 12 2013 Pete Travis <me(a)petetravis.com> - 20-0.8 -- Updates to printing beat - -* Mon Dec 09 2013 Pete Travis <me(a)petetravis.com> - 20-0.7 -- Updating contributors list - -* Thu Dec 05 2013 Pete Travis <me(a)petetravis.com> - 20-0.6 -- updating GNOME beat - -* Wed Dec 04 2013 Pete Travis <me(a)petetravis.com> - 20-0.5 -- Updates to reflect post-Beta change status -- Including translations - -* Thu Nov 07 2013 Pete Travis <me(a)petetravis.com> - 20-0.4 -- Correcting some minor markup issues. - -* Thu Nov 07 2013 Pete Travis <me(a)petetravis.com> - 20-0.3 -- Corrections of various typos -- Updated feature set for F20 Beta - -* Mon Oct 21 2013 Pete Travis <immanetize(a)fedoraproject.org> 20-0.2 -- Fix desktop file -- Adjust CSS for title banner - -* Sun Oct 20 2013 Pete Travis <immanetize(a)fedoraproject.org> 20-0.1 -* Updated content for F20 Beta - -* Sat Aug 03 2013 Pete Travis <immanetize(a)fedoraproject.org> 20-0.0 -- Prepared source for F20 beats -- Added a brief explanation of Rawhide and development branches, and a more verbose appeal to users of those branches. - -* Tue Jun 25 2013 Pete Travis <immanetize(a)fedoraproject.org> 19-0.13 -- zh_CN, fr-FR, nl-NL, ja-JP translations added -- Various content updates - -* Thu Jun 13 2013 Pete Travis <immanetize(a)fedoraproject.org> 19-0.12 -- Typos, corrections, clarifications, and updates. -- Added Hardware Overview section - -* Fri May 24 2013 Pete Travis <immanetize(a)fedoraproject.org> 19-0.9.b -- Some revisions and updates for F19 Beta RNs - -* Mon May 13 2013 Pete Travis <immanetize(a)fedoraproject.org> 19-0.8.b -- Adding content for F19 Beta - -* Tue Mar 12 2013 Pete Travis <immanetize(a)fedoraproject.org> 19-0.5.a -- Syncing updates process with upstream. No content change. - -* Tue Mar 12 2013 Pete Travis <immanetize(a)fedoraproject.org> 19-0.1.a -- Initial build for F19. There is no actual content at this point. - -* Thu Mar 07 2013 Pete Travis <immanetize(a)fedoraproject.org> 18.0.0-5 -- Bumping version so updates work. - -* Tue Feb 26 2013 Pete Travis <immanetize(a)fedoraproject.org> 18.04 -- Retool spec file to build doc in koji -- Now installs to /usr/share/doc -- Thanks to Dan Mashal, Kevin Fenzi for testing and encouragement - -* Tue Jan 8 2013 Nick Bebout <nb(a)fedoraproject.org> - 18.0.0-3 -- Pull in latest changes from master - -* Tue Jan 8 2013 Nick Bebout <nb(a)fedoraproject.org> - 18.0.0-2 -- Update Revision History - -* Tue Jan 8 2013 Nick Bebout <nb(a)fedoraproject.org> - 18.0.0-1 -- Update for Fedora 18 final - -* Tue Dec 4 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 17.95.0 -- Fedora 18 Beta release notes - -* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 17.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue May 29 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 17.1.0 -- Bugs 821168,821412,821413,824529 -- 705245, 751516 NOT corrected (yet) -- Remove Cloudstack reference -- Add languages fr-FR,it-IT (17.0 only) - -* Mon May 14 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 17.0.1 -- Add languages ja-JP,nl-NL,zh-CN,zh-TW - -* Tue May 8 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 17.0.0 -- Remove draft status -- Bulgarian and Ukranian translations - -* Mon May 7 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 16.97.0 -- BZ#817295 - various typos and broken links -- BZ#817553 - Typos in Amateur Radio and Scientific and Technical sections -- gimp has been updated to 2.8.0 -- Section on multi-seat -- Changes to direct kernel boot -- BZ#819160 - Typo in Circuit Design -- BZ#819161 - Correct URL in Circuit Design -- BZ#819164 - typo in Embedded Development section - -* Wed Mar 28 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 16.96.0 -- Additional updates for Fedora 17 beta - -* Wed Mar 21 2012 John J. McDonough <jjmcd(a)fedoraproject.org> - 16.95.0 -- Updated for Fedora 17 beta - -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 16.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 1 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 16.1.0-1 - - BZ#741975 - Various typos - - BZ#743614 - Better prose on systemd database handling - - BZ#743618 - Improved prose in setting up multiple PostgreSQL servers - - BZ#737187 - Warning about GRUB user - - BZ#743960 - Include mention of D2 - - BZ#739661 - Warning about UID/GID change - - BZ#745235 - rc.local no longer packaged - - BZ#746015 - Virtualization security - - BZ#747940 - GTK capitalization - - BZ#746672 (against VG) QEMU - capitalization - - Clean up links - - Dedication to Dennis Ritchie - - Additional translations - -* Mon Oct 10 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 16.0.0-1 - - Build for F16 GA - - Stale F15 content (BZ#741830) - - Typos in boot (BZ#743981) - -* Fri Sep 16 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 15.98.0-1 - - Release for F16 beta - -* Fri Jun 3 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 15.1.0-1 - - Typo in Virtualization (BZ#705928) - - gnuplot not GNU plot (BZ#707318) - - device naming (BZ#707730) - - Correct version number of boost (BZ#707786) - - Remove reference to disappeared GS-Theme-Selector (BZ#708085) - -* Tue May 10 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 15.0.0-1 -- Updated doc-publican-rpm (icons named to match package) -- BZ#680165, BZ#699770, BZ#701638, BZ#701780, BZ#702669 - -* Sat May 07 2011 Christopher Aillon <caillon(a)redhat.com> - 14.98.0-2 -- Update icon cache and desktop database scriptlets - -* Thu Apr 7 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.98.0-1 -- Remove dom0, dnssec, riak dropped from features -- Add description of IcedTea -- Admonitions in GNOME - -* Thu Apr 7 2011 Zachary. M Oglesby <oglesbyzm(a)gmail.com> - 14.96.1-2 -- Fixed spec file - -* Thu Apr 7 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.96.0-1 -- Point Kernel to kernelnewbies (Kernel) -- Point features to F15 instead of general feature page (Overview) -- Correct boxgrinder URL (Virtualization) -- Correct Python URL (Developer Tools) -- Correct Rails URL (Developer Tools) -- Correct avr-gcc URL (Embedded Development) -- Correct avr-c++ URL (Embedded Development) -- Correct avr-binutils URL (Embedded Development) -- Correct dfu-programmer URL (Embedded Development) -- Correct xlog URL (Amateur radio) -- Correct splat URL (Amateur radio) -- Remove redundant systemd and add administrative user per Rahul - -* Thu Apr 7 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.95.2-1 -- Separate .desktop files for GNOME and XFCE/LXDE - -* Tue Apr 5 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.95.1-1 -- Additional icon sizes (including scalable) BZ#694371 - -* Tue Apr 5 2011 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.95.0-1 -- Notes for Fedora 15 Beta - -* Tue Feb 15 2011 Tom Callaway <spot(a)fedoraproject.org> - 14.1.2-3 -- fix noise during post by adding Requires(post) for touch - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 14.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 9 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.1.2-1 -- Additional languages -- BZ#649122 - -* Tue Nov 2 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.1.1-1 -- Remove javascript from htmls - -* Mon Nov 1 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.1.0-1 -- Zero day updates -- BZ#641421 -- Remove systemd references - -* Mon Oct 18 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.0.3-1 -- Add French, Swedish, Catalan - -* Sun Oct 17 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.0.2-1 -- Updates to Russian, Ukranian, Dutch - -* Sun Oct 17 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.0.1-2 -- Correct problem with icons - -* Sun Oct 17 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.0.1-1 -- Correct problem in Russian translation - -* Sat Oct 16 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 14.0.0-1 -- Update for F14 release - -* Mon Sep 13 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 13.95.0-4 -- Correct description in specfile -- Corrects BZ#632819 - -* Mon Sep 13 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 13.95.0-3 -- Release Notes for Beta - -* Tue May 11 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 13-5 -- Add Russian translation - -* Mon May 10 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 13-4 -- Zero day updates: -- Configuration change in varnish, BZ#588953 -- Incorrect link in kernel BZ#590492 - -* Mon May 3 2010 Paul W. Frields <stickster(a)gmail.com> - 13-3 -- Include ToC in document - -* Mon May 3 2010 Paul W. Frields <stickster(a)gmail.com> - 13-2 -- Remove unnecessary desktop file validation - -* Mon May 3 2010 Paul W. Frields <stickster(a)gmail.com> - 13-1 -- Update for F13 GA release -- Add icons for hicolor theme per XDG - -* Sun May 2 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.97.0-9 -- Test build prior to GA rpm - -* Sat May 1 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.97.0-8 -- Change KDE desktop file BZ#482947 - -* Tue Apr 27 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.97.0-7 -- Write to html.lang - -* Mon Apr 5 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.95-4 -- Remove dependency on htmlview for non-desktop installs - -* Wed Mar 24 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.95-3 -- Correct license, requires - -* Wed Mar 24 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.95-2 -- Build for Beta - -* Wed Mar 24 2010 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.95-1 -- Test Build - -* Tue Nov 10 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.2-1 -- Correct issue with about-fedora omf files - -* Tue Nov 10 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.1-1 -- Zero day updates - -* Tue Nov 3 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.0-4 -- Eliminate publican during the build due to 0.44 => 1.0 probs - -* Tue Nov 3 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.0-3 -- requires publican publican-fedora - -* Tue Nov 3 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.0-2 -- Touch up .omf files for about-fedora - -* Mon Nov 2 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 12.0.0-1 -- Fedora 12 notes -- Compared to Fedora 11, many documents and formats omitted -- Only xml provided and then only for f-r-n and about-fedora. - -* Fri May 29 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 11.0.1-2 -- More translations, bump release - -* Thu May 28 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 11.0.1-1 -- Updated english in release-notes, bump version - -* Wed May 13 2009 Paul W. Frields <stickster(a)gmail.com> - 11.0.0-2 -- Fix homepage content - -* Thu May 7 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 11.0.0-1 -- Update for Fedora 11 release candidate - -* Tue Apr 14 2009 John J. McDonough <jjmcd(a)fedoraproject.org> - 10.93.0-1 -- Use publican for F11 Preview release - -* Sun Nov 16 2008 Paul W. Frields <stickster(a)gmail.com> - 10.0.0-1 -- Updates for F10 GA release - -* Fri Nov 7 2008 Paul W. Frields <stickster(a)gmail.com> - 10.0.0-0.2 -- Snapshot package for updated fedora-release compatibility - -* Thu Oct 30 2008 Paul W. Frields <stickster(a)gmail.com> - 9.92-4 -- Fix URI in Release Notes OMF file (#469179) - -* Tue Oct 28 2008 Paul W. Frields <stickster(a)gmail.com> - 9.92-3 -- Correct file names for Fedora 10 Preview Release - -* Fri Oct 17 2008 Paul W. Frields <stickster(a)gmail.com> - 9.92-2 -- Update version for Fedora 10 Preview Release - -* Thu Oct 2 2008 Paul W. Frields <stickster(a)gmail.com> - 9.92-1 -- Bump version and release to match for F10 Preview Release -- Fix description -- Fix missing README content - -* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 8.92-2 -- Provides: system-release-notes - -* Sat Jul 19 2008 Paul W. Frields <stickster(a)gmail.com> - 9.0.2-1 -- Content and translation updates -- Fix description (#453255) - -* Mon May 12 2008 Paul W. Frields <stickster(a)gmail.com> - 9.0.1-1 -- Update with various bugfixes and translation updates - -* Wed Apr 16 2008 Paul W. Frields <stickster(a)gmail.com> - 9.0.0-1 -- Update for Fedora 9 final release - -* Thu Mar 20 2008 Paul W. Frields <stickster(a)gmail.com> - 8.92-1 -- Bump version for Fedora 9 Preview Release - -* Wed Nov 7 2007 Paul W. Frields <stickster(a)gmail.com> - 8.90-1 -- Update for F-9 development branch - -* Wed Nov 7 2007 Paul W. Frields <stickster(a)gmail.com> - 8.0.1-1 -- Update with various bugfixes and translation updates - -* Tue Oct 30 2007 Paul W. Frields <stickster(a)gmail.com> - 8.0.0-3 -- Fix release number in description - -* Wed Oct 24 2007 Paul W. Frields <stickster(a)gmail.com> - 8.0.0-2 -- Fix leftover draft notice on local startpage copy (#350801) - -* Mon Oct 22 2007 Paul W. Frields <stickster(a)gmail.com> - 8.0.0-1 -- Update for final release - -* Wed Sep 26 2007 Bill Nottingham <notting(a)redhat.com> - 7.92-2 -- fix symlinking (#306781) -- set license tag -> Open Publication - -* Sun Sep 16 2007 Paul W. Frields <stickster(a)gmail.com> - 7.92-1 -- Include new start page -- Push new content for F8 test3 - -* Wed Sep 12 2007 Paul W. Frields <stickster(a)gmail.com> - 7.91-1 -- Link stylesheet resources to save space - -* Mon Aug 27 2007 Paul W. Frields <stickster(a)gmail.com> - 7.90-2 -- Remove superfluous PNG files -- Bump release for rebranding change in homepage - -* Tue Aug 21 2007 Paul W. Frields <stickster(a)gmail.com> - 7.90-1 -- Resituate HTML documentation for release spins - -* Thu May 10 2007 Paul W. Frields <stickster(a)gmail.com> - 7.0.0-1 -- Fix fedora-release-notes to use yelp ghelp facility -- Fix post script to properly update scrollkeeper -- Build for F7 - -* Fri Apr 27 2007 Paul W. Frields <stickster(a)gmail.com> - 6.93-3 -- Relocate about-fedora and use yelp's ghelp: facility (#208220) -- Fix distro name in OMF and document metadata - -* Mon Apr 23 2007 Jesse Keating <jkeating(a)redhat.com> - 6.93-2 -- Updated translations and bits from wiki - -* Sun Apr 15 2007 Paul W. Frields <stickster(a)gmail.com> - 6.93-1 -- Update for Fedora 7 test4 - -* Fri Mar 23 2007 Paul W. Frields <stickster(a)gmail.com> - 6.92-5 -- Bump release to include fixes in homepage module - -* Fri Mar 23 2007 Paul W. Frields <stickster(a)gmail.com> - 6.92-4 -- Add temporary community help notice to Release Notes for F7 test3 - -* Thu Mar 22 2007 Paul W. Frields <stickster(a)gmail.com> - 6.92-3 -- Bump release for rebuild - -* Thu Mar 22 2007 Paul W. Frields <stickster(a)gmail.com> - 6.92-2 -- Use content from all supplemental modules in Docs CVS - -* Mon Mar 19 2007 Paul W. Frields <stickster(a)gmail.com> - 6.92-1 -- Update for Fedora 7 test3 - -* Sat Jan 27 2007 Paul W. Frields <stickster(a)gmail.com> - 6.91-1 -- Update for Fedora 7 test2 - -* Sun Oct 15 2006 Paul W. Frields <stickster(a)gmail.com> - 6-3 -- Fix IG publication URL -- Amend CSS to respect font selections and restore icons - -* Sun Oct 8 2006 Paul W. Frields <stickster(a)gmail.com> - 6-2 -- Localize About Fedora menu item (somewhat) - -* Thu Oct 05 2006 Jesse Keating <jkeating(a)redhat.com> - 6-1 -- Build for FC6, lots of new translations - -* Sat Sep 30 2006 Paul W. Frields <stickster(a)gmail.com> - 5.92-7 -- Include new i18n browser home page - -* Mon Sep 25 2006 Jesse Keating <jkeating(a)redhat.com> - 5.92-6 -- Bump for lang fixes - -* Tue Sep 12 2006 Paul W. Frields <stickster(a)gmail.com> - 5.92-5 -- Update scrollkeeper data for about-fedora - -* Mon Sep 11 2006 Paul W. Frields <stickster(a)gmail.com> - 5.92-4 -- Update about-fedora - -* Wed Sep 6 2006 Paul W. Frields <stickster(a)gmail.com> - 5.92-3 -- Make sure we package README-BURNING-ISOS files - -* Tue Sep 5 2006 Jesse Keating <jkeating(a)redhat.com> - 5.92-1 -- Bump for 5.92 - -* Fri Sep 1 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-8 -- Handle i18n OMF files - -* Sat Aug 26 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-7 -- Add README-BURNING-ISOS.txt for inclusion in mirrors -- Put About document in proper directory - -* Wed Aug 2 2006 Jesse Keating <jkeating(a)redhat.com> - 5.91-6 -- bump - -* Wed Aug 2 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-5 -- Add README-Accessibility (moved from fedora-release) - -* Wed Jul 26 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-4 -- Process paths correctly (#200266) -- Package standalone HTML - -* Sun Jul 23 2006 Jesse Keating <jkeating(a)redhat.com> - 5.91-3 -- Only use tabs -- Version the indexhtml provides/obsoletes -- Cleanup post and postun scriptlets -- Don't require fedora-release, fedora-release requires us. -- Add a URL tag - -* Sun Jul 16 2006 Paul W. Frields <stickster(a)gmail.com> - 5.91-1 -- Initial release for Fedora Core 6 test2. diff --git a/fedora-release-notes16.png b/fedora-release-notes16.png deleted file mode 100644 index 91a6e1e..0000000 Binary files a/fedora-release-notes16.png and /dev/null differ diff --git a/fedora-release-notes22.png b/fedora-release-notes22.png deleted file mode 100644 index 86ddd39..0000000 Binary files a/fedora-release-notes22.png and /dev/null differ diff --git a/fedora-release-notes24.png b/fedora-release-notes24.png deleted file mode 100644 index 55c3a7c..0000000 Binary files a/fedora-release-notes24.png and /dev/null differ diff --git a/fedora-release-notes32.png b/fedora-release-notes32.png deleted file mode 100644 index 66fa0cd..0000000 Binary files a/fedora-release-notes32.png and /dev/null differ diff --git a/fedora-release-notes48.png b/fedora-release-notes48.png deleted file mode 100644 index e009a11..0000000 Binary files a/fedora-release-notes48.png and /dev/null differ diff --git a/sources b/sources deleted file mode 100644 index 4891174..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d22c71c7d670a1ee45d0429eaf6407c4 release-notes-25.0-1.tar.gz https://src.fedoraproject.org/rpms/fedora-release-notes/c/752bcb4a7ac2ed6dd…

1 0

dchen pushed to zanata-platform (f25). "fix the build"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 305e31f9df9422d17a75ccb1dc9f8edc0cc50769 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen <dchen(a)redhat.com> Date: Oct 31 2017 14:42:36 +0000 Subject: fix the build --- diff --git a/zanata-platform-4.2.1-mvn-extensions.patch b/zanata-platform-4.2.1-mvn-extensions.patch deleted file mode 100644 index aaabd2a..0000000 --- a/zanata-platform-4.2.1-mvn-extensions.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up ./.mvn/extensions.xml.mvn-extensions ./.mvn/extensions.xml ---- ./.mvn/extensions.xml.mvn-extensions 2017-02-24 15:13:24.000000000 +1000 -+++ ./.mvn/extensions.xml 2017-03-03 00:30:41.150070899 +1000 -@@ -34,9 +34,11 @@ - NB: may give odd timings when running multi-threaded - builds with mvn's -T option, eg smart builder. - --> -+  - </extensions> diff --git a/zanata-platform-4.3.0-mvn-extensions.patch b/zanata-platform-4.3.0-mvn-extensions.patch new file mode 100644 index 0000000..b1bfa78 --- /dev/null +++ b/zanata-platform-4.3.0-mvn-extensions.patch @@ -0,0 +1,12 @@ +diff -up ./zanata-platform-platform-4.3.0/.mvn/extensions.xml.mvn-extensions ./zanata-platform-platform-4.3.0/.mvn/extensions.xml +--- ./zanata-platform-platform-4.3.0/.mvn/extensions.xml.mvn-extensions 2017-10-08 23:18:05.000000000 +1000 ++++ ./zanata-platform-platform-4.3.0/.mvn/extensions.xml 2017-10-30 18:02:56.181060090 +1000 +@@ -21,7 +21,7 @@ + <extension> + <groupId>io.takari.maven</groupId> + <artifactId>takari-smart-builder</artifactId> +- <version>0.5.0</version> ++ <version>0.6.1</version> + </extension> +  + <extension> diff --git a/zanata-platform.spec b/zanata-platform.spec index da0ae2c..5341272 100644 --- a/zanata-platform.spec +++ b/zanata-platform.spec @@ -3,9 +3,11 @@ %global javac_source_ver 1.8 %global java_ver_min %{javac_source_ver}.0 %global jsr305_maven_name mvn(com.google.code.findbugs:jsr305) -%global jsr305_maven_version %(rpm -q --whatprovides "%{jsr305_maven_name}" --provides | sed -n -e 's/%{jsr305_maven_name} = //p') +%global jsr305_maven_version %(rpm -q --qf "%%{version}" --whatprovides "%{jsr305_maven_name}") %global resteasy_ver_min 3.0.6 %global resteasy_version %(rpm -q --qf "%%{version}" resteasy-core) +%global takari_smart_builder_version %(rpm -q --qf "%%{version}" takari-smart-builder) +%global takari_lifecycle_version %(rpm -q --qf "%%{version}" takari-lifecycle) %global simpleframework_version %(rpm -q --qf "%%{version}" simple) %global client_sub_modules zanata-rest-client zanata-client-commands zanata-cli %global client_command_name zanata-cli @@ -20,7 +22,7 @@ Group: Development/Tools License: LGPLv2+ URL: https://github.com/zanata/%{name} Source0: https://github.com/zanata/%{name}/archive/platform-%{version}.zip -Patch0: %{name}-4.2.1-mvn-extensions.patch +Patch0: %{name}-4.3.0-mvn-extensions.patch BuildArch: noarch @@ -37,6 +39,7 @@ BuildRequires: jgettext BuildRequires: jsr-305 BuildRequires: maven-dependency-plugin BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(io.takari.aether:aether-connector-okhttp) BuildRequires: mvn(javax.validation:validation-api) @@ -57,6 +60,7 @@ BuildRequires: mvn(org.hibernate:hibernate-validator) BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.resteasy:jaxrs-api) BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.scannotation:scannotation) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: openprops BuildRequires: powermock-api-mockito @@ -67,8 +71,8 @@ BuildRequires: simple BuildRequires: slf4j BuildRequires: slf4j-log4j12 BuildRequires: spock-core -BuildRequires: takari-lifecycle -BuildRequires: takari-smart-builder +#BuildRequires: takari-lifecycle +#BuildRequires: takari-smart-builder BuildRequires: xom Requires: java-headless >= 1:%{java_ver_min} Requires: apache-commons-csv @@ -122,7 +126,7 @@ It also contains REST stub for interacting with a Zanata server. %prep %setup -q -n %{name}-platform-%{version} -%patch0 -b .mvn-extensions -p0 +%patch0 -b .mvn-extensions -p2 ## Remove .jar files in source rm -f .mvn/wrapper/maven-wrapper.jar @@ -130,6 +134,8 @@ rm -f parent/intellij-code-style-settings.jar ## Single Thread compile sed -i -e 's/--T 1.0C/--T 1/' .mvn/maven.config +sed -i -e 's/--builder .*/--builder singlethreaded/' .mvn/maven.config +#sed -i -e 's/--builder .*/--builder multithreaded/' .mvn/maven.config ## remove SupressFBWarnings, because Fedora does not have edu.umd.cs.findbugs.annotations.SuppressFBWarnings for jSrc in $( grep -R -l edu.umd.cs --include '*.java' * ); do @@ -137,11 +143,20 @@ for jSrc in $( grep -R -l edu.umd.cs --include '*.java' * ); do sed -i -e 's/(a)SuppressFBWarnings.*$//' $jSrc done +## Global +%pom_remove_dep -r com.google.code.findbugs:findbugs-annotations +%pom_remove_plugin -r :findbugs-maven-plugin parent +%pom_remove_plugin -r :maven-enforcer-plugin parent +%pom_remove_plugin -r :takari-lifecycle-plugin + +## root %pom_xpath_set "pom:parent/pom:relativePath" "parent/pom.xml" %mvn_artifact pom.xml ## build-tools %mvn_artifact build-tools/pom.xml +%pom_xpath_set "pom:packaging" "jar" build-tools + %pom_xpath_remove "pom:profiles/pom:profile[pom:id='release']/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-gpg-plugin']" build-tools %pom_remove_plugin :maven-surefire-plugin build-tools %pom_remove_dep com.lesfurets:jenkins-pipeline-unit build-tools @@ -149,17 +164,15 @@ done rm -fr build-tools/src/test/java/TestJenkinsfile.java ## parent -%pom_remove_dep com.google.code.findbugs:findbugs-annotations parent -%pom_remove_dep org.jboss.resteasy:resteasy-bom parent +%mvn_artifact parent/pom.xml %pom_remove_plugin :animal-sniffer-maven-plugin parent %pom_remove_plugin :restrict-maven-plugin parent %pom_remove_plugin :duplicate-finder-maven-plugin parent -%pom_remove_plugin :findbugs-maven-plugin parent %pom_remove_plugin :gitdescribe-maven-plugin parent %pom_remove_plugin :jacoco-maven-plugin parent +%pom_remove_plugin :maven-antrun-plugin parent %pom_remove_plugin :maven-checkstyle-plugin parent %pom_remove_plugin :maven-eclipse-plugin parent -%pom_remove_plugin :maven-enforcer-plugin parent %pom_remove_plugin :maven-release-plugin parent %pom_remove_plugin :maven-sortpom-plugin parent %pom_remove_plugin :maven-source-plugin parent @@ -167,104 +180,104 @@ rm -fr build-tools/src/test/java/TestJenkinsfile.java %pom_remove_plugin :versions-maven-plugin parent %pom_xpath_remove "pom:profiles/pom:profile[pom:id='release']/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-gpg-plugin']" parent %pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions" "<execution><id>aggregate</id><goals><goal>aggregate</goal></goals><phase>prepare-package</phase></execution>" parent - - -# Takari plugin -%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='takari-lifecycle-plugin']/pom:dependencies" parent +%pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} parent %pom_xpath_remove "pom:build/pom:extensions" parent -%pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} parent -%pom_xpath_inject "pom:properties" "<gitDescribe>%{version}</gitDescribe>" parent +%pom_xpath_remove "pom:properties/pom:maven.compiler.compilerId" parent +%pom_xpath_inject "pom:properties" "<gitDescribe>%{version}</gitDescribe>" parent -%mvn_artifact parent/pom.xml ## api -#%pom_remove_plugin :findbugs-maven-plugin api %pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" api %mvn_artifact api/pom.xml ## zanata-common-api -%pom_remove_dep com.google.code.findbugs:findbugs-annotations api/zanata-common-api +%mvn_artifact api/zanata-common-api/pom.xml api/zanata-common-api/target/zanata-common-api-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" api/zanata-common-api + %pom_remove_plugin :enunciate-slim-maven-plugin api/zanata-common-api %pom_remove_plugin :gmaven-plugin api/zanata-common-api -%pom_remove_plugin :maven-enforcer-plugin api/zanata-common-api %pom_remove_plugin :maven-shade-plugin api/zanata-common-api %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec api/zanata-common-api -# We use the existing findbugs in fedora -%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided api/zanata-common-api %pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='resteasy-multipart-provider']" "<version>%{resteasy_version}</version>" api/zanata-common-api # delete enunciate stuff rm -rf zanata-common-api/src/test/java/org/zanata/rest/enunciate -rm -rf zanata-common-api/src/test/java/org/zanata/rest/dto/ rm -rf zanata-common-api/src/test/java/org/zanata/rest/service # remove groovy-all and spock %pom_remove_dep org.codehaus.groovy:groovy-all api/zanata-common-api %pom_remove_dep org.spockframework:spock-core api/zanata-common-api -%mvn_artifact api/zanata-common-api/pom.xml api/zanata-common-api/target/zanata-common-api-%{version}.jar ## common -#%pom_remove_dep '${project.groupId}:zanata-common-api' common -#%pom_remove_plugin :findbugs-maven-plugin common -%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-adapter-glossary -%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-adapter-xliff -%pom_remove_dep com.google.code.findbugs:findbugs-annotations common/zanata-common-util -%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided common %pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" common %mvn_artifact common/pom.xml + +%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided common + +## common/zanata-common-util +%mvn_artifact common/zanata-common-util/pom.xml common/zanata-common-util/target/zanata-common-util-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" common/zanata-common-util + +%pom_xpath_inject "pom:parent" "<relativePath>../pom.xml</relativePath>" common/zanata-common-util + +## common/zanata-adapters %mvn_artifact common/zanata-adapter-po/pom.xml common/zanata-adapter-po/target/zanata-adapter-po-%{version}.jar %mvn_artifact common/zanata-adapter-properties/pom.xml common/zanata-adapter-properties/target/zanata-adapter-properties-%{version}.jar -%mvn_artifact common/zanata-common-util/pom.xml common/zanata-common-util/target/zanata-common-util-%{version}.jar %mvn_artifact common/zanata-adapter-glossary/pom.xml common/zanata-adapter-glossary/target/zanata-adapter-glossary-%{version}.jar %mvn_artifact common/zanata-adapter-xliff/pom.xml common/zanata-adapter-xliff/target/zanata-adapter-xliff-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-po +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-properties +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-glossary +%pom_xpath_set "pom:packaging" "jar" common/zanata-adapter-xliff -## common/zanata-common-util - ## client +%pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" client +%mvn_artifact client/pom.xml %mvn_package ":zanata-{rest-client,client-commands,cli}" zanata-client %mvn_package ":client,stub-server" zanata-client -#%pom_remove_plugin :findbugs-maven-plugin client + + %pom_xpath_set "pom:properties/pom:resteasy.version" %{resteasy_version} client #%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client # Ensure it compile with supported java version %pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin client "<configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration>" -#%pom_xpath_inject "pom:plugins" "<plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>%{javac_source_ver}</source><target>%{javac_source_ver}</target><fork>true</fork><verbose>true</verbose></configuration></plugin>" client %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:version" %{simpleframework_version} client -%pom_xpath_set "pom:parent/pom:relativePath" "../parent/pom.xml" client -%mvn_artifact client/pom.xml ## stub-server -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/stub-server -#%pom_remove_dep com.google.code.findbugs:jsr305 client/stub-server +%mvn_artifact client/stub-server/pom.xml client/stub-server/target/stub-server-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/stub-server + %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/stub-server %pom_remove_dep org.scannotation:scannotation client/stub-server %pom_remove_plugin :duplicate-finder-maven-plugin client/stub-server %pom_remove_plugin :maven-surefire-plugin client/stub-server ## rest +%mvn_artifact client/zanata-rest-client/pom.xml client/zanata-rest-client/target/zanata-rest-client-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/zanata-rest-client + rm -fr client/zanata-rest-client/src/test ## remove the test dependency -%pom_remove_dep org.zanata:stub-server client/zanata-rest-client -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-rest-client -%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-rest-client -%pom_xpath_inject "pom:dependencies" "<dependency><groupId>com.google.code.findbugs</groupId><artifactId>jsr305</artifactId><version>2.0.1</version><scope>provided</scope></dependency>" client/zanata-rest-client %pom_remove_plugin :duplicate-finder-maven-plugin client/zanata-rest-client -%mvn_artifact client/zanata-rest-client/pom.xml client/zanata-rest-client/target/zanata-rest-client-%{version}.jar ## command -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-client-commands -#%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-client-commands +#%pom_remove_dep :zanata-common-api client/zanata-client-commands +#%pom_remove_dep :zanata-common-util client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-glossary client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-po client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-properties client/zanata-client-commands +#%pom_remove_dep :zanata-adapter-xliff client/zanata-client-commands +#%pom_remove_dep :zanata-rest-client client/zanata-client-commands %pom_remove_dep org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec client/zanata-client-commands -#%pom_add_dep com.google.code.findbugs:jsr305:2.0.1:provided client/zanata-common-commands %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId='org.simpleframework']/pom:artifactId" "simple-http" client/zanata-client-commands rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/*.java @@ -272,15 +285,15 @@ rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/init/* rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/*.java rm client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/*.java -%mvn_artifact client/zanata-client-commands/pom.xml client/zanata-client-commands/target/zanata-client-commands-%{version}.jar ## remove SupressFBWarnings, because Fedora does not have edu.umd.cs.findbugs.annotations.SuppressFBWarnings sed -i -e 's/import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;.*$//' client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java sed -i -e 's/(a)SuppressFBWarnings.*$//' client/zanata-client-commands/src/main/java/org/zanata/client/commands/*.java +%mvn_artifact client/zanata-client-commands/pom.xml client/zanata-client-commands/target/zanata-client-commands-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/zanata-client-commands ## cli ## No need to generate tarball, thus remove assembly-plugin -%pom_remove_dep com.google.code.findbugs:findbugs-annotations client/zanata-cli #%pom_remove_dep com.google.code.findbugs:jsr305 client/zanata-cli %pom_remove_plugin :appassembler-maven-plugin client/zanata-cli %pom_remove_plugin :maven-assembly-plugin client/zanata-cli @@ -292,6 +305,7 @@ rm client/zanata-cli/src/test/java/org/zanata/client/ClientToServerTest.java rm client/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java %mvn_artifact client/zanata-cli/pom.xml client/zanata-cli/target/zanata-cli-%{version}.jar +%pom_xpath_set "pom:packaging" "jar" client/zanata-cli ## zanata-maven-plugin # zanata-maven-plugin depends on com.pyx4j:maven-plugin-log4j, @@ -303,13 +317,7 @@ rm client/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java %pom_disable_module server %build -# Don't install here, it seems takari produces many duplicates in xmvn-reactor -# Skip the test compile for build tools to avoid Jenkinsfile unit tests -#%mvn_build -i -G -- %{mvn_build_opts} -Dmaven.test.skip -pl build-tools,parent,api,api/zanata-common-api -# Build the rest with unit tests, for it is used to build command lines -#%mvn_build -i -G -- %{mvn_build_opts} -pl '!build-tools,!parent,!api,!api/zanata-common-api' -%mvn_build -i -G -- %{mvn_build_opts} - +%mvn_build -i -X -- %{mvn_build_opts} %install %mvn_install -X @@ -325,8 +333,8 @@ for mod in . %{client_sub_modules};do sed -i.bak -e "s|/usr/lib/java/||" $mod/cp.txt sed -i.bak -e "s|-%{version}||" $mod/cp.txt if [ ! $mod = . ];then - echo -e "\n" >> cp.txt - cat $mod/cp.txt >> cp.txt + echo -e "\n" >> cp.txt + cat $mod/cp.txt >> cp.txt fi done sort -u cp.txt > cp-sorted.txt @@ -364,7 +372,7 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %doc client/README.md docs/client/index.md docs/client/configuration.md docs/client/command-hook.md %changelog -* Wed Oct 18 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.3.0-1 +* Tue Oct 31 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.3.0-1 - Upstream update to 4.3.0 * Mon Sep 04 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.4-1 https://src.fedoraproject.org/rpms/zanata-platform/c/305e31f9df9422d17a75cc…

1 0

dchen pushed to zanata-platform (f25). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild"
by notifications＠fedoraproject.org 31 Oct '17

31 Oct '17

From 91d659de5ee01d1be33dd7f6fb40d9e442b9310d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Jul 27 2017 22:39:29 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- diff --git a/zanata-platform.spec b/zanata-platform.spec index d2d64ab..72c861a 100644 --- a/zanata-platform.spec +++ b/zanata-platform.spec @@ -12,7 +12,7 @@ Name: zanata-platform Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zanata the web-based translation platform Group: Development/Tools @@ -331,6 +331,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli %doc client/README.txt docs/client/index.md docs/client/configuration.md docs/client/command-hook.md %changelog +* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 02 2017 Ding-Yi Chen <dchen(a)redhat.com> 4.2.1-1 - Upstream update to 4.2.1 https://src.fedoraproject.org/rpms/zanata-platform/c/91d659de5ee01d1be33dd7…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits October 2017