From c42806e269819044cca4b245b7a84498f57f78e0b51d62c8cccbd46487213ceb Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Sat, 26 Aug 2017 16:25:45 +0000 Subject: [PATCH 1/2] Accepting request 513181 from home:msmeissn:branches:hardware - forcefully enable PIE as automatism does not trigger. OBS-URL: https://build.opensuse.org/request/show/513181 OBS-URL: https://build.opensuse.org/package/show/hardware/gammu?expand=0&rev=39 --- gammu.changes | 5 +++++ gammu.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gammu.changes b/gammu.changes index 7187422..ff79ee4 100644 --- a/gammu.changes +++ b/gammu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 30 10:40:44 UTC 2017 - meissner@suse.com + +- forcefully enable PIE as automatism does not trigger. + ------------------------------------------------------------------- Sat Jun 17 12:27:53 UTC 2017 - ecsos@opensuse.org diff --git a/gammu.spec b/gammu.spec index 9635965..3ff848e 100644 --- a/gammu.spec +++ b/gammu.spec @@ -277,8 +277,9 @@ rm -rf helper/win32-* %build mkdir build cd build -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" +export CFLAGS="%{optflags} -fPIE" +export CXXFLAGS="%{optflags} -fPIE" +export LDFLAGS="-pie" cmake ../ \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ From 79241ed18cc9bed57fc617f78b7d3acaed5fbb5fa4fc7e855667117b3be3245b Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 14 Nov 2017 12:00:03 +0000 Subject: [PATCH 2/2] Accepting request 536930 from home:dimstar:Factory - Explicitly package systemd service on suse_version >= 1330: depending on the dep chain, systemd is already detected (and causes build failures for unpackaged files). OBS-URL: https://build.opensuse.org/request/show/536930 OBS-URL: https://build.opensuse.org/package/show/hardware/gammu?expand=0&rev=40 --- gammu.changes | 7 +++++++ gammu.spec | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/gammu.changes b/gammu.changes index ff79ee4..be13685 100644 --- a/gammu.changes +++ b/gammu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 26 12:05:38 UTC 2017 - dimstar@opensuse.org + +- Explicitly package systemd service on suse_version >= 1330: + depending on the dep chain, systemd is already detected (and + causes build failures for unpackaged files). + ------------------------------------------------------------------- Sun Jul 30 10:40:44 UTC 2017 - meissner@suse.com diff --git a/gammu.spec b/gammu.spec index 3ff848e..7990077 100644 --- a/gammu.spec +++ b/gammu.spec @@ -119,6 +119,9 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif +%if 0%{?suse_version} >= 1330 +BuildRequires: pkgconfig(systemd) +%endif BuildRequires: %{dist_bluez_libs} %if 0%{?suse_version} > 1140 BuildRequires: python-Sphinx @@ -332,6 +335,20 @@ rm -rf %{buildroot}%{_datadir}/locale/sw/ %postun -n libgsmsd%{so_ver} -p /sbin/ldconfig +%if 0%{?suse_version} >= 1330 +%pre smsd +%service_add_pre gammu-smsd.service + +%preun smsd +%service_del_preun gammu-smsd.service + +%post smsd +%service_add_post gammu-smsd.service + +%postun smsd +%service_del_postun gammu-smsd.service +%endif + %files -f %{name}.lang %defattr(-,root,root,-) %config %{_sysconfdir}/bash_completion.d/gammu @@ -372,6 +389,9 @@ rm -rf %{buildroot}%{_datadir}/locale/sw/ %{_bindir}/gammu-smsd %{_bindir}/gammu-smsd-inject %{_bindir}/gammu-smsd-monitor +%if 0%{?suse_version} >= 1330 +%{_unitdir}/gammu-smsd.service +%endif %doc %{_mandir}/man1/gammu-smsd-inject.1* %doc %{_mandir}/man1/gammu-smsd-monitor.1* %doc %{_mandir}/man1/gammu-smsd.1*