Date: Monday, November 28, 2022 @ 09:50:24 Author: dvzrv Revision: 1354735
upgpkg: solr 9.1.0-1: Upgrade to 9.1.0. Remove unused /etc/solr/server/https8.xml. Remove unnecessary quotes and curly braces. Modified: solr/trunk/PKGBUILD ----------+ PKGBUILD | 76 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-28 09:50:24 UTC (rev 1354734) +++ PKGBUILD 2022-11-28 09:50:24 UTC (rev 1354735) @@ -1,8 +1,8 @@ # Maintainer: David Runge <[email protected]> pkgname=solr -pkgver=9.0.0 -pkgrel=2 +pkgver=9.1.0 +pkgrel=1 pkgdesc="Open source enterprise search platform built on Apache Lucene" arch=(any) url="https://lucene.apache.org/solr/"; @@ -12,7 +12,6 @@ backup=( etc/$pkgname/server/jetty-http.xml etc/$pkgname/server/jetty-https.xml - etc/$pkgname/server/jetty-https8.xml etc/$pkgname/server/jetty-ssl.xml etc/$pkgname/server/jetty.xml etc/$pkgname/server/webdefault.xml @@ -30,7 +29,7 @@ skip-checks-for-git-repo.patch allow-using-system-gradle.patch ) -sha512sums=('e9802443b6f9ca1621b22aab226daef788b863f0508f44a062fac04dbd7a04d796787f8b7f57408ca4049e668799b8e76fe6ea1acb82a54253c8b5244baf3a14' +sha512sums=('1beaa819f6574ec4d5d8b2b4fc89db46f0b47109c175000ea51b5d0440fdb2845939f758bd6219d35ab991df9084550ec0ff6d8f635a278865b8115439044c25' 'SKIP' 'd9a5dcc7a30bf449abf9028bc4aa88e196c953d82b884661ec3191d4a06ec50b106c01ecdcd225e3526ab4f4ce5634d6dcd4a03f1e128fdd4c26febb1b742532' '06e5e40b96d2b6668790e4b166fc2867b9e694a2c72fd57eec702526e009b8b0495acbe16a5a27e259827477f4783ce87742f1f806254d8a2baec23b0b317058' @@ -39,7 +38,7 @@ '43267da8d3061ddb6a1e93166e049a1381fd926e7738d858be4eea65fc09def9edc9890e5b78f1a3445dae301cae358542cbb3ab1b5b805275834b77452fa9cc' '45e4811cd6018e9591d883039d051c3df3d0cc9aa852baf9eb5ca01c57df9818bb038da3da8b9f5fed161af66f241b9fed08dcaaf2344d82917785980345d1bd' 'b5d62225e623b0256eadfc58c0d9d7827ba933d3c9ef8840e2d3661549d575994166114cf7addfcb598f71f336cf93152db8e5ff50e7dd3657efbef9cbac8381') -b2sums=('d3e837e09a8a5e954591edea7f293971cab560ce41c6e3e842e686dfa32b450bff95670c61bf99a7124fdc4e1e0fabd9f5dd2b676b79bab542a929208e79063b' +b2sums=('b73900c1d4df8124a0effa3c8dfc166c7144ce96321b5cc36e249545760a1b75e913cf0a0edd2d29e158dcbf1c350b6c2531c0df4410d2f2f92e8b69253737a2' 'SKIP' 'f970329fad0358cb19af9b9337047612d5949af8aea2dc7acd6c8424ba494644940d22f46b98a9cf1362ea2e5d966b863907de35e7c0edc2e48f7b0ed00473b7' '60ff37059a4ab8362551518d56ee105e7d19199727605d5ad6f3236bd31dde1cc5fa37ffa37009820ee3115da36ae64df4754454cef1db51d1c13cac039245cb' @@ -67,40 +66,42 @@ prepare() { cd $pkgname-$pkgver - patch -Np1 -i "${srcdir}"/support-reproducible-builds.patch - patch -Np1 -i "${srcdir}"/skip-failing-test.patch - patch -Np1 -i "${srcdir}"/skip-checks-for-git-repo.patch - patch -Np1 -i "${srcdir}"/allow-using-system-gradle.patch + patch -Np1 -i "$srcdir"/support-reproducible-builds.patch + patch -Np1 -i "$srcdir"/skip-failing-test.patch + patch -Np1 -i "$srcdir"/skip-checks-for-git-repo.patch + patch -Np1 -i "$srcdir"/allow-using-system-gradle.patch } build() { - cd "${pkgname}-${pkgver}" + cd $pkgname-$pkgver # override adding -SNAPSHOT on version # skip signing of jars # skip generation of reference guide /usr/bin/gradle \ - -Dversion.release=${pkgver} \ + -Dversion.release=$pkgver \ assembleRelease \ -Psign=false -x signJarsPublication \ -Prefguide.include=false - install -vdm 755 "${srcdir}/${pkgname}-${pkgver}/dist" - tar -xf "${pkgname}/distribution/build/release/${pkgname}-${pkgver}.tgz" \ - --strip 1 -C "${srcdir}/${pkgname}-${pkgver}/dist" + install -vdm 755 "$srcdir/$pkgname-$pkgver/dist" + tar -xf "$pkgname/distribution/build/release/$pkgname-$pkgver.tgz" --strip 1 -C "$srcdir/$pkgname-$pkgver/dist" } check() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver + /usr/bin/gradle \ - -Dversion.release=${pkgver} \ + -Dversion.release=$pkgver \ test \ - -Prefguide.include=false + -Prefguide.include=false } package() { - cd "${pkgname}-${pkgver}" + local config + cd $pkgname-$pkgver + # remove unneeded and OS specific scripts rm -rvf dist/bin/{install_solr_service.sh,solr.cmd,solr.in.cmd} @@ -107,34 +108,35 @@ # make target script executable chmod 755 dist/bin/${pkgname} # symlink script into PATH - install -vdm 755 "${pkgdir}/usr/bin/" - ln -sv "/usr/share/${pkgname}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + install -vdm 755 "$pkgdir/usr/bin/" + ln -sv /usr/share/$pkgname/bin/$pkgname "$pkgdir/usr/bin/$pkgname" # configuration - install -vDm 644 dist/bin/${pkgname}.in.sh -t "${pkgdir}/etc/$pkgname" + install -vDm 644 dist/bin/$pkgname.in.sh -t "${pkgdir}/etc/$pkgname" install -vDm 644 dist/server/etc/*.xml -t "${pkgdir}/etc/$pkgname/server" - install -vDm 644 dist/server/${pkgname}/$pkgname.xml -t "${pkgdir}/etc/${pkgname}/" - install -vDm 644 dist/server/${pkgname}/zoo.cfg -t "${pkgdir}/etc/${pkgname}/" - install -vdm 755 "${pkgdir}/usr/share/${pkgname}/" + install -vDm 644 dist/server/$pkgname/$pkgname.xml -t "$pkgdir/etc/$pkgname/" + install -vDm 644 dist/server/$pkgname/zoo.cfg -t "$pkgdir/etc/$pkgname/" # copy application - cp -dr --no-preserve='ownership' dist/{bin,docs,example,licenses,modules,server} "${pkgdir}/usr/share/${pkgname}/" + install -vdm 755 "$pkgdir/usr/share/$pkgname/" + cp -dr --no-preserve='ownership' dist/{bin,docs,example,licenses,modules,server} "$pkgdir/usr/share/$pkgname/" # symlink configuration into place - ln -svf /etc/${pkgname}/${pkgname}.in.sh "${pkgdir}/usr/share/${pkgname}/" + ln -svf /etc/$pkgname/$pkgname.in.sh "$pkgdir/usr/share/$pkgname/" - install -vdm 750 "${pkgdir}/var/lib/${pkgname}" - ln -svf /etc/${pkgname}/${pkgname}.xml "$pkgdir/var/lib/$pkgname" - ln -svf /etc/${pkgname}/zoo.cfg "${pkgdir}/var/lib/${pkgname}" - for config in {jetty,jetty-{http,https,https8,ssl},webdefault}.xml; do - ln -svf /etc/${pkgname}/server/${config} "${pkgdir}/usr/share/${pkgname}/server/etc/${config}" + install -vdm 750 "$pkgdir/var/lib/$pkgname" + ln -svf /etc/$pkgname/$pkgname.xml "$pkgdir/var/lib/$pkgname/" + ln -svf /etc/$pkgname/zoo.cfg "$pkgdir/var/lib/$pkgname/" + for config in {jetty,jetty-{http,https,ssl},webdefault}.xml; do + ln -svf /etc/$pkgname/server/$config "$pkgdir/usr/share/$pkgname/server/etc/$config" done + # logs directory - install -vdm 750 "${pkgdir}/var/log/${pkgname}" + install -vdm 750 "$pkgdir/var/log/$pkgname/" # docs - install -vDm 644 dist/{CHANGES,NOTICE}.txt -t "${pkgdir}/usr/share/doc/${pkgname}/" - install -vDm 644 dist/README.md -t "${pkgdir}/usr/share/doc/${pkgname}/" - install -vDm 644 ../${pkgname}.service -t "${pkgdir}/usr/lib/systemd/system/" - install -vDm 644 ../${pkgname}.sysusers "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" - install -vDm 644 ../${pkgname}.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + install -vDm 644 dist/{CHANGES,NOTICE}.txt -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 ../$pkgname.service -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 ../$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -vDm 644 ../$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" }
