From c2ebce6f339bbc5530c7f9490cdc2dbb95c2ebfa Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 29 Sep 2013 18:18:53 +0200 Subject: [PATCH 1/4] New package: network-ups-tools-2.6.5_1 --- common/shlibs | 1 + srcpkgs/network-ups-tools-devel | 1 + srcpkgs/network-ups-tools/template | 32 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 120000 srcpkgs/network-ups-tools-devel create mode 100644 srcpkgs/network-ups-tools/template diff --git a/common/shlibs b/common/shlibs index 0e0fd0d8854..7dd30d8910b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1414,3 +1414,4 @@ libupnp.so.6 libupnp-1.6.18_1 libmozjs-17.0.so mozjs17-17.0.0_1 libgeocode-glib.so.0 geocode-glib-3.10.0_1 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1 +libupsclient.so.1 network-ups-tools-2.6.5_1 diff --git a/srcpkgs/network-ups-tools-devel b/srcpkgs/network-ups-tools-devel new file mode 120000 index 00000000000..1d89f9adf91 --- /dev/null +++ b/srcpkgs/network-ups-tools-devel @@ -0,0 +1 @@ +network-ups-tools/ \ No newline at end of file diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template new file mode 100644 index 00000000000..b7af13da533 --- /dev/null +++ b/srcpkgs/network-ups-tools/template @@ -0,0 +1,32 @@ +# Template file for 'network-ups-tools' +pkgname=network-ups-tools +version=2.6.5 +revision=1 +build_style=gnu-configure +configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc/ups --without-doc + --datadir=/usr/share/ups --with-user=nut --with-group=nut --with-ssl --with-serial + --with-usb --with-udev-dir=/usr/lib/udev --with-systemdsystemunitdir=/lib/systemd/system" +makedepends="openssl-devel libusb-compat-devel" +short_desc="NUT provides UPS control and monitoring features" +maintainer="Ypnose " +license="GPL-2" +homepage="http://www.networkupstools.org/" +distfiles="http://www.networkupstools.org/source/2.6/nut-$version.tar.gz" +checksum=618df71cf1ca6e3700d1d3c282773a2dec85f9f20324c0d3234c824e97feb93f +wrksrc="nut-${version}" + +network-ups-tools-devel_package() { + depends="network-ups-tools>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove "usr/lib/*.so.*" + } +} + +network-ups-tools_package() { + pkg_install() { + vmove all + } +} From 60cd89de63465e57e063b8b1d39235d3c01ff99b Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Sep 2013 13:22:03 +0200 Subject: [PATCH 2/4] network-ups-tools: create user/group and removed *-devel --- srcpkgs/network-ups-tools-devel | 1 - srcpkgs/network-ups-tools/template | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 120000 srcpkgs/network-ups-tools-devel diff --git a/srcpkgs/network-ups-tools-devel b/srcpkgs/network-ups-tools-devel deleted file mode 120000 index 1d89f9adf91..00000000000 --- a/srcpkgs/network-ups-tools-devel +++ /dev/null @@ -1 +0,0 @@ -network-ups-tools/ \ No newline at end of file diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index b7af13da533..7cc3a3522c3 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -3,7 +3,7 @@ pkgname=network-ups-tools version=2.6.5 revision=1 build_style=gnu-configure -configure_args="--prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc/ups --without-doc +configure_args="--sbindir=/usr/bin --sysconfdir=/etc/ups --without-doc --datadir=/usr/share/ups --with-user=nut --with-group=nut --with-ssl --with-serial --with-usb --with-udev-dir=/usr/lib/udev --with-systemdsystemunitdir=/lib/systemd/system" makedepends="openssl-devel libusb-compat-devel" @@ -15,17 +15,9 @@ distfiles="http://www.networkupstools.org/source/2.6/nut-$version.tar.gz" checksum=618df71cf1ca6e3700d1d3c282773a2dec85f9f20324c0d3234c824e97feb93f wrksrc="nut-${version}" -network-ups-tools-devel_package() { - depends="network-ups-tools>=${version}" - short_desc+=" - development files" - pkg_install() { - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove "usr/lib/*.so.*" - } -} - network-ups-tools_package() { + system_accounts="nut" + depends="shadow" pkg_install() { vmove all } From 6b7a5a8ff63515750d0e4e96795e61308a33862c Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Sep 2013 20:17:01 +0200 Subject: [PATCH 3/4] network-ups-tools: drop the lib --- common/shlibs | 1 - 1 file changed, 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 7dd30d8910b..0e0fd0d8854 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1414,4 +1414,3 @@ libupnp.so.6 libupnp-1.6.18_1 libmozjs-17.0.so mozjs17-17.0.0_1 libgeocode-glib.so.0 geocode-glib-3.10.0_1 libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1 -libupsclient.so.1 network-ups-tools-2.6.5_1 From e6fb632efb5c263c754b448e857f914f0ba6c095 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Sep 2013 20:17:59 +0200 Subject: [PATCH 4/4] bar-git: update to 20130930_1 --- srcpkgs/bar-git/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bar-git/template b/srcpkgs/bar-git/template index 8b564f59ae9..68cf64944ff 100644 --- a/srcpkgs/bar-git/template +++ b/srcpkgs/bar-git/template @@ -1,6 +1,6 @@ # Template file for 'bar-git' pkgname=bar-git -version=20130927 +version=20130930 revision=1 makedepends="libxcb-devel" short_desc="A lightweight xcb based bar" @@ -22,7 +22,9 @@ do_build() { do_install() { make PREFIX=/usr DESTDIR=$DESTDIR install - vinstall LICENSE 644 usr/share/licenses/$pkgname + vinstall palette.pl 755 usr/bin + vinstall LICENSE 644 usr/share/licenses/${pkgname} + vinstall README.md 644 usr/share/doc/${pkgname} } bar-git_package() {