From 871853db943e7436b6879408dfa9703499df20b72624a375948fbcce844883bf Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 27 Mar 2014 13:05:35 +0000 Subject: [PATCH 1/2] Accepting request 227601 from home:jengelh:branches:Base:System - Implement shlib packaging guidelines: new libgpm2 subpackage - Add missing %pre scriptlet OBS-URL: https://build.opensuse.org/request/show/227601 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=34 --- baselibs.conf | 2 +- gpm.changes | 6 ++++++ gpm.spec | 22 +++++++++++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 6370d43..d75dc05 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -gpm +libgpm2 diff --git a/gpm.changes b/gpm.changes index 0963751..6bc07fd 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 26 14:03:21 UTC 2014 - jengelh@inai.de + +- Implement shlib packaging guidelines: new libgpm2 subpackage +- Add missing %pre scriptlet + ------------------------------------------------------------------- Mon Dec 2 11:40:18 UTC 2013 - coolo@suse.com diff --git a/gpm.spec b/gpm.spec index f43820b..b74d847 100644 --- a/gpm.spec +++ b/gpm.spec @@ -1,7 +1,7 @@ # # spec file for package gpm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ Name: gpm +%define lname libgpm2 Version: 1.20.7 Release: 0 Summary: Console Mouse Support @@ -73,10 +74,19 @@ server for applications running on the Linux console. It can be used by mc (Midnight Commander) or by w3m, the text-based Web browser. It provides console cut and paste operations. +%package -n %lname +Summary: Console mouse support library +Group: System/Libraries + +%description -n %lname +This package provides a library that handles mouse requests and +delivers them to applications. See the description for the "gpm" +package for more information. + %package devel -Requires: %{name} = %{version} Summary: Development files for gpm (Console Mouse Support) Group: Development/Libraries/C and C++ +Requires: %lname = %version %description devel Development files for the gpm (general purpose mouse) package. @@ -157,6 +167,9 @@ rm -fv $RPM_BUILD_ROOT/%{_libdir}/libgpm.a mkdir -p %{buildroot}/run touch %{buildroot}/run/gpm.pid +%pre +%service_add_pre gpm.service + %preun %service_del_preun gpm.service @@ -183,10 +196,13 @@ touch %{buildroot}/run/gpm.pid %{_unitdir}/gpm.service %{_bindir}/* %{_sbindir}/* -%{_libdir}/libgpm.so.* /var/adm/fillup-templates/* %ghost /run/gpm.pid +%files -n %lname +%defattr(-,root,root) +%_libdir/libgpm.so.2* + %files devel %defattr(-,root,root) %{_includedir}/gpm.h From 1ad06d65f557cf12782a04d59d5dfb4aa07365e11e29d1f5725344a854972e0f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 6 Apr 2014 05:24:27 +0000 Subject: [PATCH 2/2] Accepting request 229116 from home:dimstar:branches:Base:System - Install gpm.service without executable bit. The service files are never 'started'. This silences a warning in journal: systemd[1]: Configuration file /usr/lib/systemd/system/gpm.service is marked executable. Please remove executable permission bits. Proceeding anyway OBS-URL: https://build.opensuse.org/request/show/229116 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=35 --- gpm.changes | 9 +++++++++ gpm.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gpm.changes b/gpm.changes index 6bc07fd..2c5cfc5 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 5 18:03:49 UTC 2014 - dimstar@opensuse.org + +- Install gpm.service without executable bit. The service files are + never 'started'. This silences a warning in journal: + systemd[1]: Configuration file /usr/lib/systemd/system/gpm.service + is marked executable. Please remove executable permission bits. + Proceeding anyway + ------------------------------------------------------------------- Wed Mar 26 14:03:21 UTC 2014 - jengelh@inai.de diff --git a/gpm.spec b/gpm.spec index b74d847..529cdd8 100644 --- a/gpm.spec +++ b/gpm.spec @@ -147,7 +147,7 @@ install -m 755 -d $RPM_BUILD_ROOT/%{_unitdir} install -m 755 -d $RPM_BUILD_ROOT/usr/sbin install -m 755 inputattach %{buildroot}%{_sbindir} install -m 644 sysconfig.mouse-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 %{S:2} $RPM_BUILD_ROOT/%{_unitdir}/gpm.service +install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_unitdir}/gpm.service ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcgpm # there were two variables with the same value GPM_PROTOCOL and MOUSETYPE # in SuLi 8.2. The MOUSETYPE variable better conforms with with other