From 7702e67ec97957a407e2f5c4f5cbce47a8552b4a Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Wed, 26 Jul 2017 16:32:06 +0200 Subject: [PATCH 1/7] Fixed rpmlint warning due to incorrect source field Signed-off-by: Otavio R. Piske --- dist/paho-c.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/paho-c.spec b/dist/paho-c.spec index 143ac28a..cbc8f7fa 100644 --- a/dist/paho-c.spec +++ b/dist/paho-c.spec @@ -4,10 +4,10 @@ Summary: MQTT C Client Name: paho-c Version: 1.2.0 -Release: 0%{?dist} +Release: 1%{?dist} License: Eclipse Distribution License 1.0 and Eclipse Public License 1.0 Group: Development/Tools -Source: paho-c-%{version}.tar.gz +Source: https://github.com/eclipse/paho.mqtt.c/archive/v%{version}.tar.gz URL: https://eclipse.org/paho/clients/c/ BuildRequires: cmake BuildRequires: gcc From 154984f35842441e910f4df9d7973495695f9a84 Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Wed, 26 Jul 2017 18:47:40 +0200 Subject: [PATCH 2/7] Renames the tarball to match the released one Signed-off-by: Otavio R. Piske --- dist/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/Makefile b/dist/Makefile index 685815c5..f16247ef 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -2,7 +2,7 @@ VERSION=1.2.0 rpm-prep: mkdir -p ${HOME}/rpmbuild/SOURCES/ - tar --transform="s/\./paho-c-${VERSION}/" -cf ${HOME}/rpmbuild/SOURCES/paho-c-${VERSION}.tar.gz --exclude=./build.paho --exclude=.git --exclude=*.bz ./ --gzip + tar --transform="s/\./paho-c-${VERSION}/" -cf ${HOME}/rpmbuild/SOURCES/v${VERSION}.tar.gz --exclude=./build.paho --exclude=.git --exclude=*.bz ./ --gzip rpm: rpm-prep rpmbuild -ba dist/paho-c.spec From d3126cc73838ecbb2f296892e818c7fecc340a22 Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Wed, 26 Jul 2017 18:52:38 +0200 Subject: [PATCH 3/7] Fixes buildroot-related RPM lint warnings by following Fedora packaging conventions for CMake Signed-off-by: Otavio R. Piske --- dist/paho-c.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/paho-c.spec b/dist/paho-c.spec index cbc8f7fa..95a46279 100644 --- a/dist/paho-c.spec +++ b/dist/paho-c.spec @@ -42,12 +42,12 @@ Development documentation files for the the Paho MQTT C Client. %build mkdir build.paho && cd build.paho -cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr .. -make +%cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DPAHO_BUILD_SAMPLES=TRUE .. +make %{?_smp_mflags} %install cd build.paho -make install +make install DESTDIR=%{buildroot} %files %doc edl-v10 epl-v10 From b4f085696a6bc90472fe28fac8d7c2b2ad6cf43d Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Thu, 27 Jul 2017 19:54:30 +0200 Subject: [PATCH 4/7] Fixed RPM changelog section to comply with Fedora packaging guidelines Signed-off-by: Otavio R. Piske --- dist/paho-c.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dist/paho-c.spec b/dist/paho-c.spec index 95a46279..7156372e 100644 --- a/dist/paho-c.spec +++ b/dist/paho-c.spec @@ -4,7 +4,7 @@ Summary: MQTT C Client Name: paho-c Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: Eclipse Distribution License 1.0 and Eclipse Public License 1.0 Group: Development/Tools Source: https://github.com/eclipse/paho.mqtt.c/archive/v%{version}.tar.gz @@ -61,5 +61,15 @@ make install DESTDIR=%{buildroot} %{_datadir}/* %changelog -* Sat Dec 31 2016 Otavio R. Piske - 20161231 +* Wed Jun 26 2017 Otavio R. Piske - 1.2.0-2 +- Updated changelog to comply with Fedora packaging guidelines + +* Wed Jun 26 2017 Otavio R. Piske - 1.2.0-1 +- Fixed rpmlint warnings: replaced cmake call with builtin macro +- Fixed rpmlint warnings: removed buildroot reference from build section + +* Fri Jun 30 2017 Otavio R. Piske - 1.2.0-0 +- Updated package to version 1.2.0 + +* Sat Dec 31 2016 Otavio R. Piske - 1.1.0 - Initial packaging From e2e1389b608f8838861155eecb4e383089c841eb Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Thu, 27 Jul 2017 20:16:15 +0200 Subject: [PATCH 5/7] Fixed changelog dates and their ordering Signed-off-by: Otavio R. Piske --- dist/paho-c.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dist/paho-c.spec b/dist/paho-c.spec index 7156372e..7c3290c7 100644 --- a/dist/paho-c.spec +++ b/dist/paho-c.spec @@ -4,7 +4,7 @@ Summary: MQTT C Client Name: paho-c Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: Eclipse Distribution License 1.0 and Eclipse Public License 1.0 Group: Development/Tools Source: https://github.com/eclipse/paho.mqtt.c/archive/v%{version}.tar.gz @@ -61,14 +61,17 @@ make install DESTDIR=%{buildroot} %{_datadir}/* %changelog -* Wed Jun 26 2017 Otavio R. Piske - 1.2.0-2 +* Thu Jul 27 2017 Otavio R. Piske - 1.2.0-3 +- Fixed changelog issues pointed by rpmlint + +* Thu Jul 27 2017 Otavio R. Piske - 1.2.0-2 - Updated changelog to comply with Fedora packaging guidelines -* Wed Jun 26 2017 Otavio R. Piske - 1.2.0-1 +* Wed Jul 26 2017 Otavio R. Piske - 1.2.0-1 - Fixed rpmlint warnings: replaced cmake call with builtin macro - Fixed rpmlint warnings: removed buildroot reference from build section -* Fri Jun 30 2017 Otavio R. Piske - 1.2.0-0 +* Fri Jun 30 2017 Otavio R. Piske - 1.2.0 - Updated package to version 1.2.0 * Sat Dec 31 2016 Otavio R. Piske - 1.1.0 From afd8b2225502f67811ac6f226316cbefd7655a66 Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Thu, 27 Jul 2017 20:18:14 +0200 Subject: [PATCH 6/7] Added a new target to review RPM spec file for problems Signed-off-by: Otavio R. Piske --- dist/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/Makefile b/dist/Makefile index f16247ef..88d9c3df 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -1,5 +1,8 @@ VERSION=1.2.0 +check: + rpmlint -i dist/paho-c.spec + rpm-prep: mkdir -p ${HOME}/rpmbuild/SOURCES/ tar --transform="s/\./paho-c-${VERSION}/" -cf ${HOME}/rpmbuild/SOURCES/v${VERSION}.tar.gz --exclude=./build.paho --exclude=.git --exclude=*.bz ./ --gzip From 1204f01e8ad62801e595deacd9e44edec291a042 Mon Sep 17 00:00:00 2001 From: "Otavio R. Piske" Date: Thu, 27 Jul 2017 20:35:07 +0200 Subject: [PATCH 7/7] Enabled generation of debuginfo package Signed-off-by: Otavio R. Piske --- dist/paho-c.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/paho-c.spec b/dist/paho-c.spec index 7c3290c7..93143496 100644 --- a/dist/paho-c.spec +++ b/dist/paho-c.spec @@ -1,6 +1,3 @@ -%global _enable_debug_package 0 -%global debug_package %{nil} - Summary: MQTT C Client Name: paho-c Version: 1.2.0 @@ -61,6 +58,9 @@ make install DESTDIR=%{buildroot} %{_datadir}/* %changelog +* Thu Jul 27 2017 Otavio R. Piske - 1.2.0-4 +- Enabled generation of debuginfo package + * Thu Jul 27 2017 Otavio R. Piske - 1.2.0-3 - Fixed changelog issues pointed by rpmlint