From b21d2328565ef6666c0806a18c0a716c9d2c687988bdd470c3138bce86cada9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 20 Jun 2016 13:26:40 +0000 Subject: [PATCH] Accepting request 403559 from home:jengelh:branches:hardware - Reset RPM groups; throw out useless use of cat, use full configure call OBS-URL: https://build.opensuse.org/request/show/403559 OBS-URL: https://build.opensuse.org/package/show/hardware/libjaylink?expand=0&rev=7 --- libjaylink.changes | 5 +++++ libjaylink.spec | 17 +++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libjaylink.changes b/libjaylink.changes index 0710fd3..00f64be 100644 --- a/libjaylink.changes +++ b/libjaylink.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 19 20:09:09 UTC 2016 - jengelh@inai.de + +- Reset RPM groups + ------------------------------------------------------------------- Thu May 12 17:15:42 UTC 2016 - afaerber@suse.de diff --git a/libjaylink.spec b/libjaylink.spec index ef5a859..7dfe66f 100644 --- a/libjaylink.spec +++ b/libjaylink.spec @@ -1,7 +1,7 @@ # # spec file for package libjaylink # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,9 +28,9 @@ BuildRequires: autoconf >= 2.64 BuildRequires: automake BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: xz BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) -BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): udev Requires(postun): udev @@ -42,6 +42,7 @@ Library for accessing Segger J-Link USB devices. %package -n libjaylink0 Summary: USB interface library for J-Link +Group: System/Libraries Recommends: libjaylink %description -n libjaylink0 @@ -49,31 +50,27 @@ Library for accessing Segger J-Link USB devices. %package devel Summary: USB interface library for J-Link -- development files +Group: Development/Libraries/C and C++ Requires: libjaylink0 = %{version} %description devel Library for accessing Segger J-Link USB devices. -This sub-package contains development files. +This sub-package contains the development files. %prep %setup -q %build ./autogen.sh -./configure \ - --prefix=%{_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - --disable-static \ - CFLAGS="${RPM_OPT_FLAGS}" +%configure --disable-static make %{?_smp_mflags} %install make %{?_smp_mflags} install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/libjaylink.la mkdir -p %{buildroot}%{_udevdir}/rules.d -cat contrib/99-libjaylink.rules | sed -e 's/GROUP="plugdev"/GROUP="users"/' > %{buildroot}%{_udevdir}/rules.d/99-libjaylink.rules +sed -e 's/GROUP="plugdev"/GROUP="users"/' %{buildroot}%{_udevdir}/rules.d/99-libjaylink.rules %post %udev_rules_update