1

[alpine-aports] [PATCH] main/nginx: fix collision with deprecated package "nginx-initscripts"

Valery Kartel
Details
Message ID
<20160603143151.17610-1-valery.kartel@gmail.com>
Sender timestamp
1464964311
DKIM signature
missing
Download raw message
Patch: +2 -1
---
 main/nginx/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 6cc3e7d..5741405 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=nginx
 pkgver=1.10.0
-pkgrel=0
+pkgrel=1
 pkgdesc="HTTP and reverse proxy server"
 url="http://www.nginx.org/en"
 arch="all"
@@ -134,6 +134,7 @@ package() {
 common() {
 	pkgdesc="$pkgdesc (common files)"
 	depends=
+	replaces="nginx-initscripts"
 	arch="noarch"
 	mkdir -p "$subpkgdir"
 	mv "$pkgdir"/etc "$pkgdir"/var "$subpkgdir"/
-- 
2.8.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20160603164720.3e2e4f31@ncopa-desktop.alpinelinux.org>
In-Reply-To
<20160603143151.17610-1-valery.kartel@gmail.com> (view parent)
Sender timestamp
1464965240
DKIM signature
missing
Download raw message
On Fri,  3 Jun 2016 17:31:51 +0300
Valery Kartel <valery.kartel@gmail.com> wrote:

> ---
>  main/nginx/APKBUILD | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
> index 6cc3e7d..5741405 100644
> --- a/main/nginx/APKBUILD
> +++ b/main/nginx/APKBUILD
> @@ -4,7 +4,7 @@
>  
>  pkgname=nginx
>  pkgver=1.10.0
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="HTTP and reverse proxy server"
>  url="http://www.nginx.org/en"
>  arch="all"
> @@ -134,6 +134,7 @@ package() {
>  common() {
>  	pkgdesc="$pkgdesc (common files)"
>  	depends=
> +	replaces="nginx-initscripts"
>  	arch="noarch"
>  	mkdir -p "$subpkgdir"
>  	mv "$pkgdir"/etc "$pkgdir"/var "$subpkgdir"/

thanks!


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---