[system-config-network] version 1.6.6
Nils Philippsen
nphilipp at fedoraproject.org
Thu Dec 13 15:37:35 UTC 2012
commit a583832940351fa56bc3b9e4b8c1440b451ac957
Author: Nils Philippsen <nils at redhat.com>
Date: Thu Dec 13 16:35:33 2012 +0100
version 1.6.6
.gitignore | 1 +
sources | 2 +-
system-config-network.spec | 151 +++++++++++++++++++++++++++++++-------------
3 files changed, 108 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f58a812..2257341 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/system-config-network-1.6.1.tar.bz2
/system-config-network-1.6.2.tar.bz2
/system-config-network-1.6.3.tar.bz2
+/system-config-network-1.6.6.tar.bz2
diff --git a/sources b/sources
index b3fa55a..61d12dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63f76b2325ea5e3fdae71038521cc30f system-config-network-1.6.3.tar.bz2
+cf189f8bca4454d21612a19b9364cf31 system-config-network-1.6.6.tar.bz2
diff --git a/system-config-network.spec b/system-config-network.spec
index bddb523..3d65d50 100644
--- a/system-config-network.spec
+++ b/system-config-network.spec
@@ -1,37 +1,63 @@
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%bcond_with gui
+%else
+%bcond_without gui
+%endif
+
# -*- RPM-SPEC -*-
-Summary: The GUI of the Network Administration Tool
+Summary: Network Administration Tool
Name: system-config-network
-Version: 1.6.3
-Release: 2%{?dist}
+Version: 1.6.6
+Release: 1%{?dist}
URL: http://fedoraproject.org/wiki/SystemConfig/network
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
License: GPLv2+
Group: Applications/System
BuildArch: noarch
-Obsoletes: isdn-config <= 0.18-10.70 internet-config <= 0.40-2 rp3 <= 1.1.10-4 redhat-config-network <= %{version}
-Provides: redhat-config-network = %{version} isdn-config = 0.18-10.70.1 internet-config = 0.40-2.1
-BuildRequires: python >= 0:2.2, openjade, docbook-style-dsssl, perl, gettext, glibc-devel
-BuildRequires: gcc, desktop-file-utils, perl-XML-Parser, intltool
+BuildRequires: python
+BuildRequires: openjade
+BuildRequires: docbook-style-dsssl
+BuildRequires: perl
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: perl-XML-Parser
+BuildRequires: intltool
+%if %{with gui}
Requires: %{name}-tui = %{version}-%{release}
-Requires: pygtk2-libglade, pygtk2, gnome-python2, gnome-python2-canvas
-Requires: usermode-gtk, xdg-utils, gnome-python2-gnome, gnome-python2-bonobo
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: pygtk2-libglade
+Requires: pygtk2
+Requires: gnome-python2
+Requires: gnome-python2-canvas
+Requires: usermode-gtk
+Requires: xdg-utils
+Requires: gnome-python2-gnome
+Requires: gnome-python2-bonobo
+%endif
%description
-This is the GUI of the network configuration tool,
+This is %{?with_gui:the GUI of }the network configuration tool,
supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
+%if %{with gui}
%package tui
Summary: The Network Administration Tool
-Group: Applications/System
-Obsoletes: netcfg <= 2.36-3p redhat-config-network-tui <= %{version} netconf <= 0.1-1 netconfig <= 0.8.24-1.2.2.1
-Provides: redhat-config-network-tui = %{version} netcfg = 2.36-3p.1 netconf = 0.1-1.1 netconfig = 0.8.24-1.2.2.1.1
-Requires: initscripts >= 0:5.99, usermode , python, rpm-python, newt-python, pciutils, usermode, dbus-python
-Requires: python-ethtool python-iwlib
-
+Group: Applications/System
+%endif
+Requires: initscripts
+Requires: usermode
+Requires: rpm-python
+Requires: newt-python
+Requires: pciutils
+Requires: usermode
+Requires: dbus-python
+Requires: python-ethtool
+Requires: python-iwlib
+
+%if %{with gui}
%description tui
This is the network configuration tool,
supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
+%endif
%prep
%setup -q
@@ -40,7 +66,6 @@ supporting Ethernet, Wireless, TokenRing, ADSL, ISDN and PPP.
%configure
%install
-rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir $RPM_BUILD_ROOT%{_datadir}/applications
@@ -56,15 +81,31 @@ done;
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/networking/devices
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/networking/profiles/default
-%find_lang %name
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%if ! %{with gui}
+# remove GUI-only files
+for gui_file in \
+ %{_datadir}/system-config-network/help \
+ %{_datadir}/system-config-network/pixmaps \
+ %{_datadir}/system-config-network/netconfpkg/gui \
+ %{_datadir}/system-config-network/netconf.py \
+ %{_datadir}/system-config-network/netconf_control.py \
+ %{_sbindir}/system-config-network-gui \
+ %{_bindir}/system-control-network \
+ %{_datadir}/applications \
+ %{_datadir}/pixmaps; do
+ rm -rf $RPM_BUILD_ROOT/"$gui_file"
+done
+%endif
+%find_lang %name
-%files
-%defattr(-,root,root,-)
+# With a GUI, put GUI-only files in the main package and TUI and shared files
+# in the tui subpackage. Otherwise put TUI and common files in the main
+# package.
+%files %{!?with_gui:-f %{name}.lang}
+%if %{with gui}
%doc COPYING
+%{_datadir}/system-config-network/help
%{_datadir}/system-config-network/pixmaps
%{_datadir}/system-config-network/netconfpkg/gui
%{_datadir}/system-config-network/netconf.py*
@@ -74,12 +115,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
-%files -f %{name}.lang tui
-%defattr(-,root,root,-)
+%files %{?with_gui:-f %{name}.lang} tui
+%endif
%doc COPYING
%dir %{_datadir}/system-config-network
-%doc %dir %{_datadir}/system-config-network/help
-%doc %{_datadir}/system-config-network/help/*
%{_datadir}/system-config-network/netconf_cmd.py*
%{_datadir}/system-config-network/netconf_tui.py*
%{_datadir}/system-config-network/version.py*
@@ -103,6 +142,28 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/system-config-network-cmd
%changelog
+* Thu Dec 13 2012 Nils Philippsen <nils at redhat.com> 1.6.6-1
+- get rid of ancient obsoletes/provides, obsolete versioned and build
+ dependencies
+- use fedorahosted source URL
+- make GUI optional, disable it per default in Fedora 18 and later
+- fix bogus changelog dates
+- package help files only with GUI, don't mark as documentation
+
+* Thu Aug 16 2012 Jiri Popelka <jpopelka at redhat.com> 1.6.5-1
+- ConfShellVar(): use quotation marks instead of apostrophes
+ around variable names. (RHBZ#846081)
+
+* Tue Aug 07 2012 Jiri Popelka <jpopelka at redhat.com> 1.6.4-1
+- version 1.6.4
+ - Don't write DEVICE= line (rhbz#846081)
+ - add support for lcs devices
+ - Disable the Bind to MAC address option on bond slave devices (rhbz #504824)
+ - Do not remove GATEWAYDEV from /etc/sysconfig/network (rhbz #602688).
+ - Don't remove route-ethX on save (rhbz #501530)
+ - Establishing a QETH Connection chapter added to help
+ - use xdg-open instead of htmlview
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -128,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1.6.0-4
- recompiling .py files against Python 2.7 (rhbz#623403)
-* Wed Jul 17 2010 Rex Dieter <rdieter at fedoraproject.org> 1.6.0-3
+* Sat Jul 17 2010 Rex Dieter <rdieter at fedoraproject.org> 1.6.0-3
- use xdg-utils instead of hard-coded /usr/bin/htmlview (#614600)
* Tue Mar 16 2010 Jiri Popelka <jpopelka at redhat.com> 1.6.0-2
@@ -346,11 +407,11 @@ rm -rf $RPM_BUILD_ROOT
* Tue Oct 25 2005 Harald Hoyer <harald at redhat.com> - 1.3.29
- fixed profileFrame labeling
-* Wed Oct 10 2005 Harald Hoyer <harald at redhat.com> - 1.3.28
+* Wed Oct 19 2005 Harald Hoyer <harald at redhat.com> - 1.3.28
- fixed picture paths in glade files
- fixed cancel case of passphrase dialog
-* Wed Oct 10 2005 Harald Hoyer <harald at redhat.com> - 1.3.27
+* Wed Oct 19 2005 Harald Hoyer <harald at redhat.com> - 1.3.27
- use new pam stack replacement
- added OnParent for Alias Devices
- added SPI and better key generation for ipsec
@@ -362,7 +423,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Apr 20 2005 Harald Hoyer <harald at redhat.com> - 1.3.26
- CBCP_MSN added (bug #125710)
-* Tue Mar 31 2005 Harald Hoyer <harald at redhat.com> - 1.3.25
+* Thu Mar 31 2005 Harald Hoyer <harald at redhat.com> - 1.3.25
- more i18n languages
* Wed Mar 30 2005 Harald Hoyer <harald at redhat.com> - 1.3.24
@@ -521,7 +582,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Jun 18 2003 Harald Hoyer <harald at redhat.de> 1.2.12-2
- fixed #97562
-* Thu Jun 17 2003 Harald Hoyer <harald at redhat.de> 1.2.12-1
+* Tue Jun 17 2003 Harald Hoyer <harald at redhat.de> 1.2.12-1
- wlan0 handling
- splash screen bug fixed
- improvements in HW list handling
@@ -567,7 +628,7 @@ rm -rf $RPM_BUILD_ROOT
- fixed #84725
- warning for #84752
-* Fri Feb 12 2003 Harald Hoyer <harald at redhat.de> 1.1.97-1
+* Wed Feb 12 2003 Harald Hoyer <harald at redhat.de> 1.1.97-1
- fixed #83692
- updated documentation
@@ -720,10 +781,10 @@ rm -rf $RPM_BUILD_ROOT
- add Token Ring/Wireless/Cipe Druids
- more fixes
-* Wed Mar 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.9.20-1
+* Tue Mar 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.9.20-1
- Rebuild... it should have more fixes
-* Wed Mar 26 2002 Than Ngo <than at redhat.com> 0.9.19-1
+* Tue Mar 26 2002 Than Ngo <than at redhat.com> 0.9.19-1
- add functions for status/activate/deactivate in neat
- more fixes
@@ -757,13 +818,13 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 07 2002 Than Ngo <than at redhat.com> 0.9.10.1-1
- fixed bug #57853
-* Tue Dec 03 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.9.10-1
+* Mon Dec 03 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.9.10-1
- minor fixes, more translations
* Mon Nov 26 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.9.9-0.1
- Trying again, with more fixes :)
-* Fri Nov 25 2001 Than Ngo <than at redhat.com> 0.9.8-0.6
+* Sun Nov 25 2001 Than Ngo <than at redhat.com> 0.9.8-0.6
- fixed bug #56145, #56146, #56147
* Tue Nov 20 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.9.8-0.5
@@ -806,10 +867,10 @@ rm -rf $RPM_BUILD_ROOT
- add CTC and IUCV support for s390/s390x
- disable Dialup on s390/s390x
-* Thu Sep 5 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.9-1
+* Thu Sep 6 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.9-1
- Add Russian
-* Wed Sep 4 2001 Phil Knirsch <phil at redhat.de> 0.8.4-1
+* Wed Sep 5 2001 Phil Knirsch <phil at redhat.de> 0.8.4-1
- Fixed problem with unwanted removal of entries in /etc/modules.conf (#53042)
* Mon Sep 3 2001 Than Ngo <than at redhat.com> 0.8.3-1
@@ -927,11 +988,11 @@ rm -rf $RPM_BUILD_ROOT
- Fixed problems with modem volume in hardware dialog
- Fixed missing /dev/modem for modem setup (#50673)
-* Wed Aug 2 2001 Yukihiro Nakai <ynakai at redhat.com>
+* Thu Aug 2 2001 Yukihiro Nakai <ynakai at redhat.com>
- POTFILES.in list up fix
- Add Japanese translation
-* Wed Aug 02 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.2-1
+* Wed Aug 01 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.2-1
- More bugfixes
* Tue Jul 24 2001 Than Ngo <than at redhat.com> 0.6.1-1
@@ -974,11 +1035,11 @@ rm -rf $RPM_BUILD_ROOT
* Wed Jul 11 2001 Phil Knirsch <phil at redhat.de> 0.3.0-2
- Fixed critical problem during profile saving.
-* Wed Jul 10 2001 Phil Knirsch <phil at redhat.de> 0.3.0-1
+* Tue Jul 10 2001 Phil Knirsch <phil at redhat.de> 0.3.0-1
- 0.3.0-1
- Final touches for beta2. Most stuff should work now.
-* Thu Jul 10 2001 Phil Knirsch <phil at redhat.de> 0.2.2-2
+* Tue Jul 10 2001 Phil Knirsch <phil at redhat.de> 0.2.2-2
- Added some missing files.
* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
More information about the scm-commits
mailing list