From 925e3a17aa32e145d3c5af17038463024cd03a23 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 10 Apr 2014 09:04:31 +0000 Subject: [PATCH] added rpmlint to rpm dist step --- ext/toolchain/commands1.py | 10 ++++++++-- res/synergy.desktop | 2 +- res/synergy.spec.in | 7 +++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index ffa93c8f..aacd0299 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -1054,12 +1054,18 @@ class InternalCommands: try: self.try_chdir(rpmDir) cmd = 'rpmbuild -bb --define "_topdir `pwd`" synergy.spec' - print "RPM command: " + cmd + print "Command: " + cmd err = os.system(cmd) if err != 0: - raise Exception('Package failed: ' + str(err)) + raise Exception('rpmbuild failed: ' + str(err)) self.unixMove('RPMS/*/*.rpm', target) + + cmd = 'rpmlint ' + target + print "Command: " + cmd + err = os.system(cmd) + if err != 0: + raise Exception('rpmlint failed: ' + str(err)) finally: self.restore_chdir() diff --git a/res/synergy.desktop b/res/synergy.desktop index 743701e5..4fd04a10 100644 --- a/res/synergy.desktop +++ b/res/synergy.desktop @@ -4,4 +4,4 @@ Comment=Share your keyboard and mouse over a network Exec=synergy Icon=/usr/share/icons/synergy.ico Type=Application -Categories=Utility +Categories=Utility; diff --git a/res/synergy.spec.in b/res/synergy.spec.in index 10a3bb72..71af0b15 100644 --- a/res/synergy.spec.in +++ b/res/synergy.spec.in @@ -1,9 +1,9 @@ # -*- rpm-spec -*- -Summary: Synergy +Summary: Keyboard and mouse sharing utility Name: synergy Release: 1 License: GPLv2 -Group: Applications/Accessories +Group: Applications/Productivity URL: http://synergy-foss.org/ Source: http://synergy-foss.org/download/ Vendor: The Synergy Project @@ -12,8 +12,7 @@ Version: ${in:version} %description Synergy is free and open source software for sharing one mouse and keyboard -between multiple computers. Works on Windows, Mac OS X, Linux, Android and -Apple iOS. +between multiple computers. Works on Windows, Mac OS X, Linux. %prep source=%{_topdir}/../..