rpms/system-config-network/devel sources, 1.25, 1.26 system-config-network.spec, 1.34, 1.35

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/system-config-network/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6149

Modified Files:
	sources system-config-network.spec 
Log Message:
* Mon Dec 03 2007 Harald Hoyer <harald at redhat.com>, Jiri Moskovcak <jmoskovc at redhat.com> - 1.4.7
- added HAL support
- fixed /etc/hosts parser
- added "Controlled by NetworkManager"
- do not fall into modified state for activate/deactivate (rhbz#377261)
- moved network.xpm to (pkgdatadir)/pixmaps (rhbz#377861)



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	15 Oct 2007 12:28:25 -0000	1.25
+++ sources	3 Dec 2007 10:46:54 -0000	1.26
@@ -1 +1 @@
-bc4d322e46e2b7567e3f90727ffca49d  system-config-network-1.4.3.tar.gz
+dccc1fdb47a6a84730f6d6ca5acac113  system-config-network-1.4.7.tar.gz


Index: system-config-network.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-network/devel/system-config-network.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- system-config-network.spec	7 Nov 2007 13:39:56 -0000	1.34
+++ system-config-network.spec	3 Dec 2007 10:46:54 -0000	1.35
@@ -1,18 +1,18 @@
 # -*- RPM-SPEC -*-
 Summary: The GUI of the Network Adminstration Tool
 Name: system-config-network
-Version: 1.4.3
-Release: 2%{?dist}
+Version: 1.4.7
+Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/network
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System 
 BuildArch: noarch
-Obsoletes: isdn-config internet-config rp3 redhat-config-network
-Provides: redhat-config-network = %{version}
-BuildRequires: python >= 0:2.2, openjade, docbook-style-dsssl, perl, gettext, glibc-devel, gcc, desktop-file-utils, yelp, perl-XML-Parser
+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, gcc, desktop-file-utils, perl-XML-Parser
 Requires: %{name}-tui = %{version}-%{release}
-Requires: libglade2, pygtk2-libglade, pygtk2, gnome-python2, gnome-python2-canvas
+Requires: pygtk2-libglade, pygtk2, gnome-python2, gnome-python2-canvas, usermode, /usr/bin/htmlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,9 +22,9 @@
 %package tui
 Summary: The Network Adminstration Tool
 Group: Applications/System 
-Obsoletes: netcfg, redhat-config-network-tui, netconfig
-Provides: redhat-config-network-tui
-Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils
+Obsoletes: netcfg <= 2.36-3p redhat-config-network-tui <= %{version} netconf <= 0.1-1
+Provides: redhat-config-network-tui = %{version} netcfg = 2.36-3p.1 netconf = 0.1-1.1
+Requires: initscripts >= 0:5.99, usermode , kudzu, python, rhpl >= 0:0.193, rpm-python, newt-python, pciutils, usermode, dbus-python
 
 %description tui
 This is the network configuration tool,
@@ -33,9 +33,8 @@
 %prep
 %setup -q
 
-%configure
-
 %build
+%configure
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -44,13 +43,16 @@
 mkdir $RPM_BUILD_ROOT%{_datadir}/applications
 
 for i in neat.desktop neat-control.desktop; do \
-  desktop-file-install --vendor redhat --delete-original      \
+  desktop-file-install --vendor redhat --delete-original       \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
     --add-category System                                     \
     --add-category Settings                                   \
     $RPM_BUILD_ROOT%{_datadir}/system-config-network/$i; \
 done;
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/networking/devices
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/networking/profiles/default
+
 %find_lang %name
 
 %clean
@@ -58,7 +60,8 @@
 
 
 %files 
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING 
 %{_datadir}/system-config-network/pixmaps
 %{_datadir}/system-config-network/netconfpkg/gui
 %{_datadir}/system-config-network/netconf.py*
@@ -72,9 +75,11 @@
 %{_datadir}/pixmaps/*
 
 %files -f %{name}.lang tui
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING
 %dir %{_datadir}/system-config-network
-%{_datadir}/system-config-network/help
+%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*
@@ -88,6 +93,10 @@
 %{_datadir}/system-config-network/providerdb
 %config(noreplace) %{_sysconfdir}/pam.d/*
 %config(noreplace) %{_sysconfdir}/security/console.apps/*
+%dir %{_sysconfdir}/sysconfig/networking
+%dir %{_sysconfdir}/sysconfig/networking/profiles
+%dir %{_sysconfdir}/sysconfig/networking/profiles/default
+%dir %{_sysconfdir}/sysconfig/networking/devices
 %{_sbindir}/neat-tui
 %{_sbindir}/system-config-network
 %{_sbindir}/system-config-network-tui
@@ -96,12 +105,28 @@
 %{_bindir}/system-config-network-cmd
 
 %changelog
-* Wed Nov  7 2007 Stepan Kasal <skasal at redhat.com> - 1.4.3-2
+* Mon Dec 03 2007 Harald Hoyer <harald at redhat.com>, Jiri Moskovcak <jmoskovc at redhat.com> - 1.4.7
+- added HAL support
+- fixed /etc/hosts parser
+- added "Controlled by NetworkManager"
+- do not fall into modified state for activate/deactivate (rhbz#377261)
+- moved network.xpm to (pkgdatadir)/pixmaps (rhbz#377861)
+
+* Mon Nov 12 2007 Harald Hoyer <harald at redhat.com> - 1.4.5
+- changed yelp to htmlview
+
+* Wed Nov  7 2007 Stepan Kasal <skasal at redhat.com> - 1.4.4
 - s/NEtwork/Network/ in the summary of -tui, to be consistent
   with the summary line of the main rpm (the neat acronym is no
   longer advertised anyway)
 - Resolves: #239216
 
+* Fri Oct 26 2007 Harald Hoyer <harald at redhat.com> - 1.4.4
+- removed not yet used NCBackendHal.py (rhbz#353771)
+- fixed yelp dependency (rhbz#344981)
+- moved %%configure to %%build (rhbz#353761)
+- fixed type with getRoot (rhbz#368871)
+
 * Mon Oct 15 2007 Harald Hoyer <harald at redhat.com> - 1.4.3
 - fixed /etc/hosts problem (rhbz#331451)