* [PR PATCH] profile-cleaner: resolve conflict with pc
@ 2022-12-29 9:51 kruceter
2022-12-29 10:28 ` [PR PATCH] [Updated] " kruceter
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: kruceter @ 2022-12-29 9:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
There is a new pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages profile-cleaner
https://github.com/void-linux/void-packages/pull/41342
profile-cleaner: resolve conflict with pc
Makefile shipped with the package shortens profile-cleaner to pc, thus causing conflict with the 'pc' package.
Discovered in #41298.
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/41342.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-profile-cleaner-41342.patch --]
[-- Type: text/x-diff, Size: 1392 bytes --]
From 07ad80adc5e72b699748dc1dbfc4b193cf3b438f Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 29 Dec 2022 12:45:46 +0300
Subject: [PATCH] profile-cleaner: resolve conflict with pc
Makefile shipped with the package shortens profile-cleaner to pc, thus
causing conflict with the 'pc' package.
---
srcpkgs/profile-cleaner/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template
index 1ed480d7ebd7..7d0df51cb8cb 100644
--- a/srcpkgs/profile-cleaner/template
+++ b/srcpkgs/profile-cleaner/template
@@ -1,7 +1,7 @@
# Template file for 'profile-cleaner'
pkgname=profile-cleaner
version=2.42
-revision=1
+revision=2
build_style=gnu-makefile
depends="bash sqlite bc parallel findutils"
short_desc="Reduces profile size by cleaning their sqlite databases"
@@ -11,6 +11,11 @@ homepage="https://github.com/graysky2/profile-cleaner"
distfiles="https://github.com/graysky2/profile-cleaner/archive/v${version}.tar.gz"
checksum=427d3c9aa0ab7cd1031a40e6da507027bd3ce4bc80a504a9dbeee536e864e9e1
-post_install() {
+do_install() {
+ # makefile shipped with the package shortens profile-cleaner to pc,
+ # thus causing conflict with the 'pc' package.
+ vbin common/profile-cleaner
+ vcompletion common/zsh-completion zsh
+ vman doc/pc.1 profile-cleaner.1
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] profile-cleaner: resolve conflict with pc
2022-12-29 9:51 [PR PATCH] profile-cleaner: resolve conflict with pc kruceter
@ 2022-12-29 10:28 ` kruceter
2022-12-29 10:31 ` kruceter
2023-01-02 20:33 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: kruceter @ 2022-12-29 10:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is an updated pull request by kruceter against master on the void-packages repository
https://github.com/kruceter/void-packages profile-cleaner
https://github.com/void-linux/void-packages/pull/41342
profile-cleaner: resolve conflict with pc
Makefile shipped with the package shortens profile-cleaner to pc, thus causing conflict with the 'pc' package.
Discovered in #41298.
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/41342.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-profile-cleaner-41342.patch --]
[-- Type: text/x-diff, Size: 1448 bytes --]
From b20d87285b8990ba9d03245e3648d7b2f4eec34d Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Thu, 29 Dec 2022 12:45:46 +0300
Subject: [PATCH] profile-cleaner: resolve conflict with pc
Makefile shipped with the package shortens profile-cleaner to pc, thus
causing conflict with the 'pc' package.
---
srcpkgs/profile-cleaner/template | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template
index 1ed480d7ebd7..823021e9cccd 100644
--- a/srcpkgs/profile-cleaner/template
+++ b/srcpkgs/profile-cleaner/template
@@ -1,7 +1,7 @@
# Template file for 'profile-cleaner'
pkgname=profile-cleaner
version=2.42
-revision=1
+revision=2
build_style=gnu-makefile
depends="bash sqlite bc parallel findutils"
short_desc="Reduces profile size by cleaning their sqlite databases"
@@ -12,5 +12,12 @@ distfiles="https://github.com/graysky2/profile-cleaner/archive/v${version}.tar.g
checksum=427d3c9aa0ab7cd1031a40e6da507027bd3ce4bc80a504a9dbeee536e864e9e1
post_install() {
+ # makefile shipped with the package shortens profile-cleaner to pc,
+ # thus causing conflict with the 'pc' package.
+ unlink ${DESTDIR}/usr/bin/pc
+ mv ${DESTDIR}/usr/share/man/man1/pc.1 \
+ ${DESTDIR}/usr/share/man/man1/profile-cleaner.1
+ mv ${DESTDIR}/usr/share/zsh/site-functions/_pc \
+ ${DESTDIR}/usr/share/zsh/site-functions/_profile-cleaner
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: profile-cleaner: resolve conflict with pc
2022-12-29 9:51 [PR PATCH] profile-cleaner: resolve conflict with pc kruceter
2022-12-29 10:28 ` [PR PATCH] [Updated] " kruceter
@ 2022-12-29 10:31 ` kruceter
2023-01-02 20:33 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: kruceter @ 2022-12-29 10:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41342#issuecomment-1367222164
Comment:
@paper42, will this satisfy your request?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: profile-cleaner: resolve conflict with pc
2022-12-29 9:51 [PR PATCH] profile-cleaner: resolve conflict with pc kruceter
2022-12-29 10:28 ` [PR PATCH] [Updated] " kruceter
2022-12-29 10:31 ` kruceter
@ 2023-01-02 20:33 ` paper42
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2023-01-02 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There's a merged pull request on the void-packages repository
profile-cleaner: resolve conflict with pc
https://github.com/void-linux/void-packages/pull/41342
Description:
Makefile shipped with the package shortens profile-cleaner to pc, thus causing conflict with the 'pc' package.
Discovered in #41298.
#### Testing the changes
- I tested the changes in this PR: **briefly**
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-02 20:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-29 9:51 [PR PATCH] profile-cleaner: resolve conflict with pc kruceter
2022-12-29 10:28 ` [PR PATCH] [Updated] " kruceter
2022-12-29 10:31 ` kruceter
2023-01-02 20:33 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).