From 26f5812fd3b06c0d55fbe3344a58616f20a6bf3608795a86fb8a1ea2d59f5521 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Mon, 27 Jun 2011 08:20:06 +0000 Subject: [PATCH] Accepting request 74579 from home:Lazy_Kent:branches:network:utilities fix build in openSUSE >= 11.3 OBS-URL: https://build.opensuse.org/request/show/74579 OBS-URL: https://build.opensuse.org/package/show/network:utilities/ipcalc?expand=0&rev=2 --- ipcalc.changes | 22 +++++++++++++++++++++ ipcalc.spec | 52 +++++++++++++++++++++++++++++++------------------- patch-queue | 21 ++++++++++---------- 3 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 ipcalc.changes diff --git a/ipcalc.changes b/ipcalc.changes new file mode 100644 index 0000000..e0dc7c1 --- /dev/null +++ b/ipcalc.changes @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Sun Jun 26 22:24:37 UTC 2011 - lazy.kent@opensuse.org + +- refreshed patch to fix build in openSUSE >= 11.3 +- splitted off rpm changelog to changes +- corrected License tag +- added Authors +- formatted spec + +------------------------------------------------------------------- +Sun Nov 18 00:00:00 UTC 2007 - guru@unixtech.be + +- moved to openSUSE Build Service +- added minor patch + +------------------------------------------------------------------- +Sun Oct 22 00:00:00 UTC 2006 - guru@unixtech.be + +- new upstream version +- rewrote spec file + + diff --git a/ipcalc.spec b/ipcalc.spec index 925ac12..5a79a57 100644 --- a/ipcalc.spec +++ b/ipcalc.spec @@ -1,18 +1,31 @@ -# norootforbuild +# +# spec file for package ipcalc +# +# Copyright (c) 2011 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. -%define _prefix /usr +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# -Name: ipcalc -Version: 0.41 -Release: 0 -Summary: IPv4 Address Calculator -Source: http://jodies.de/ipcalc-archive/ipcalc-%{version}.tar.gz -Patch1: http://jodies.de/ipcalc-archive/patch-queue -URL: http://jodies.de/ipcalc -Group: Productivity/Networking/System -License: GNU General Public License (GPL) -BuildRoot: %{_tmppath}/build-%{name}-%{version} -BuildArch: noarch +Name: ipcalc +Version: 0.41 +Release: 0 +License: GPL-2.0+ +Summary: IPv4 Address Calculator +URL: http://jodies.de/ipcalc +Group: Productivity/Networking/System +Source0: http://jodies.de/ipcalc-archive/ipcalc-%{version}.tar.gz +Patch1: http://jodies.de/ipcalc-archive/patch-queue +BuildArch: noarch +BuildRoot: %{_tmppath}/build-%{name}-%{version} %description ipcalc takes an IP address and netmask and calculates the resulting @@ -24,6 +37,12 @@ Enter your netmask(s) in CIDR notation (/25) or dotted decimals (255.255.255.0). Inverse netmasks are recognized. If you omit the netmask ipcalc uses the default netmask for the class of your network. + + +Authors: +-------- + Krischan Jodies + %prep %setup -q %patch1 @@ -42,13 +61,6 @@ netmask ipcalc uses the default netmask for the class of your network. %{_bindir}/ipcalc %changelog -* Sun Nov 18 2007 Pascal Bleser 0.41 -- moved to openSUSE Build Service -- added minor patch - -* Sun Oct 22 2006 Pascal Bleser 0.41-1 -- new upstream version -- rewrote spec file # Local Variables: # mode: rpm-spec diff --git a/patch-queue b/patch-queue index 6d21919..ecef9cc 100644 --- a/patch-queue +++ b/patch-queue @@ -1,23 +1,24 @@ Jahreszahl, Mehrzahl und omit ;-) ---- ipcalc-0.41 2006-07-27 11:42:31.000000000 +0200 -+++ ipcalc 2006-07-28 17:05:50.000000000 +0200 +Index: ipcalc +=================================================================== +--- ipcalc.orig ++++ ipcalc @@ -2,7 +2,7 @@ - - + + # IPv4 Calculator -# Copyright (C) Krischan Jodies 2000 - 2004 +# Copyright (C) Krischan Jodies 2000 - 2006 # krischan()jodies.de, http://jodies.de/ipcalc - # + # # This program is free software; you can redistribute it and/or modify -@@ -1082,7 +1082,7 @@ +@@ -1082,7 +1082,7 @@ sub help { IP Calculator $version - + Enter your netmask(s) in CIDR notation (/25) or dotted decimals (255.255.255.0). -Inverse netmask are recognized. If you mmit the netmask, ipcalc uses the default +Inverse netmasks are recognized. If you omit the netmask, ipcalc uses the default netmask for the class of your network. - - Look at the space between the bits of the addresses: The bits before it are - + + Look at the space between the bits of the addresses: The bits before it are