Some clean-ups.

Author: dreibh

debian/control

@@ -7,8 +7,8 @@ Vcs-Git: https://github.com/dreibh/subnetcalc.git
 Vcs-Browser: https://github.com/dreibh/subnetcalc
 Build-Depends: cmake,
                debhelper (>= 12),
-               libgeoip-dev,
-               pkgconf | pkg-config
+               gettext,
+               libgeoip-dev
 Standards-Version: 4.7.0
 Rules-Requires-Root: no
 

po/nb/subnetcalc.po

@@ -263,7 +263,7 @@ msgstr "ikke nødvendig på punkt-til-punkt-lenker"
 
 #: src/subnetcalc.cc:894
 msgid "Wildcard Mask"
-msgstr "Wildcard Mask"
+msgstr "Wildcardmaske"
 
 #: src/subnetcalc.cc:899
 msgid "Hex. Address"

rpm/subnetcalc.spec

@@ -3,19 +3,19 @@ Version: 2.5.2~rc0
 Release: 1
 Summary: IPv4/IPv6 Subnet Calculator
 Group: Applications/Internet
-License: GPL-3+
+License: GPL-3.0-or-later
 URL: https://www.nntb.no/~dreibh/subnetcalc/
 Source: https://www.nntb.no/~dreibh/subnetcalc/download/%{name}-%{version}.tar.xz
 
 AutoReqProv: on
 BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: gcc-c++
+BuildRequires: gettext
 BuildRequires: GeoIP-devel
 Requires: GeoIP
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
-%define _unpackaged_files_terminate_build 0
 
 %description
 SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or IPv6
@@ -39,8 +39,11 @@ interface ID, etc.). Finally, it can generate IPv6 unique local prefixes.
 
 %files
 %{_bindir}/subnetcalc
+%{_datadir}/bash-completion/completions/subnetcalc
+%{_datadir}/locale/*/LC_MESSAGES/subnetcalc.mo
 %{_mandir}/man1/subnetcalc.1.gz
 
+
 %doc
 
 %changelog

src/subnetcalc.cc

@@ -699,12 +699,12 @@ void printAddressProperties(std::ostream&         os,
 
          // ------ 6to4 Address ---------------------------------------------
          if((a & 0x2002) == 0x2002) {
-            os << "      + " << gettext("6to4 address = ");
             sockaddr_union sixToFour;
             sixToFour.sa.sa_family       = AF_INET;
             const uint32_t u = ntohs(((const uint16_t*)&ipv6address.s6_addr)[1]);
             const uint32_t l = ntohs(((const uint16_t*)&ipv6address.s6_addr)[2]);
             sixToFour.in.sin_addr.s_addr = htonl((u << 16) | l);
+            os << "      + " << gettext("6to4 address") << " = ";
             printAddress(std::cout, &sixToFour.sa, false);
             os << "\n";
          }