Thu Feb 21 15:12:17 UTC 2008

Author: rbrich

Update of /cvs/extras/rpms/system-config-bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2325

Modified Files:
	.cvsignore sources system-config-bind.spec 
Removed Files:
	system-config-bind-4.0.2-DNSSECkey-record-column.patch 
	system-config-bind-4.0.2-SSHFPrecord.patch 
	system-config-bind-4.0.2-check-child.patch 
	system-config-bind-4.0.2-correct-typos.patch 
	system-config-bind-4.0.2-rndc-label-correction.patch 
	system-config-bind-4.0.2-ver.patch 
	system-config-bind-4.0.2-version-2.patch 
Log Message:
release 4.0.5 - clean up + fix #423761


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/system-config-bind/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32

--- .cvsignore	17 Oct 2006 10:57:55 -0000	1.31
+++ .cvsignore	21 Feb 2008 15:11:42 -0000	1.32
@@ -1,30 +1 @@
-system-config-bind-4.0.0.tar.gz
-system-config-bind-4.0.0-4.5.tar.gz
-system-config-bind-4.0.0-7.tar.gz
-system-config-bind-4.0.0-10.tar.gz
-system-config-bind-4.0.0-11.tar.gz
-system-config-bind-4.0.0-12_FC4.tar.gz
-system-config-bind-4.0.0-14_FC4.tar.gz
-system-config-bind-4.0.0-16_FC4.tar.gz
-system-config-bind-4.0.0-18_FC4.tar.gz
-system-config-bind-4.0.0-18_FC5.tar.gz
-system-config-bind-4.0.0-19_FC5.tar.gz
-system-config-bind-4.0.0-20_FC5.tar.gz
-system-config-bind-4.0.0-22_FC5.tar.gz
-system-config-bind-4.0.0-24_FC5.tar.gz
-system-config-bind-4.0.0-26_FC5.tar.gz
-system-config-bind-4.0.0-28_FC5.tar.gz
-system-config-bind-4.0.0-30_FC5.tar.gz
-system-config-bind-4.0.0-31_FC5.tar.gz
-system-config-bind-4.0.0-32_FC5.tar.gz
-system-config-bind-4.0.0-33_FC5.tar.gz
-system-config-bind-4.0.0-34_FC5.tar.gz
-system-config-bind-4.0.0-36_FC5.tar.gz
-system-config-bind-4.0.0-38_FC5.tar.gz
-system-config-bind-4.0.0-40_FC5.tar.gz
-system-config-bind-4.0.0-41_FC5.tar.gz
-system-config-bind-4.0.0-41_FC6.tar.gz
-system-config-bind-4.0.0-42_FC6.tar.gz
-system-config-bind-4.0.0-44.fc6.tar.gz
-system-config-bind-4.0.1.tar.gz
-system-config-bind-4.0.2.tar.gz
+system-config-bind-4.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-bind/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	17 Oct 2006 10:57:55 -0000	1.48
+++ sources	21 Feb 2008 15:11:42 -0000	1.49
@@ -1 +1 @@
-800982a11933122c77828d3e53977c3b  system-config-bind-4.0.2.tar.gz
+c86139f56fff5f683091d40c894395f1  system-config-bind-4.0.5.tar.gz


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-bind/devel/system-config-bind.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- system-config-bind.spec	30 May 2007 13:25:50 -0000	1.69
+++ system-config-bind.spec	21 Feb 2008 15:11:42 -0000	1.70
@@ -1,28 +1,17 @@
-Summary: 	BIND DNS Configuration Tool.
-Name: 		system-config-bind
-Version: 	4.0.2
-Release: 	8%{?dist}
-License: 	GPL
-Group: 		Applications/System
-Source0: 	%{name}-%{version}.tar.gz
-Patch: 		system-config-bind-4.0.2-ver.patch
-Patch1:		system-config-bind-4.0.2-version-2.patch
-Patch2:		system-config-bind-4.0.2-check-child.patch
-Patch3:		system-config-bind-4.0.2-SSHFPrecord.patch
-Patch4:		system-config-bind-4.0.2-correct-typos.patch
-Patch5:		system-config-bind-4.0.2-rndc-label-correction.patch
-Patch6:		system-config-bind-4.0.2-DNSSECkey-record-column.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: 	noarch
-BuildRequires:  python, gettext, make, intltool
-Requires: 	python >= 2.2
-Requires: 	pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
-Requires: 	bind, bind-utils
+Summary:        BIND DNS Configuration Tool
+Name:           system-config-bind
+Version:        4.0.5
+Release:        1%{?dist}
+URL:            http://fedorahosted.org/system-config-bind
+License:        GPLv2+
+Group:          Applications/System
+Source0:        %{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:      noarch
+BuildRequires:  python, gettext, make, intltool, desktop-file-utils
+Requires:       pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
+Requires:       bind, bind-utils, usermode
 Requires(post): hicolor-icon-theme
-Obsoletes: 	redhat-config-bind
-Obsoletes: 	bindconf
-
-%define debug_package %{nil}
 
 %description
 The system-config-bind package provides a graphical user interface (GUI) to
@@ -33,54 +22,48 @@
 
 %prep
 %setup -q
-%patch  -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -b .sshfprecord
-%patch4	-p1 -b .correct-typos
-%patch5 -p1
-%patch6 -p1
 
 %build
-rm -rf $RPM_BUILD_ROOT
 make 
 
 %install
+rm -rf %{buildroot}
 make install      ROOT=%{buildroot}
 %find_lang %{name} || touch %{name}.lang;
 %find_lang bindconf || touch bindconf.lang;
 cat %{name}.lang bindconf.lang > scb.lang
 
-echo "%{version}" > $RPM_BUILD_ROOT/usr/share/system-config-bind/system-config-bind.version
+desktop-file-install --vendor "" --delete-original  \
+  --dir %{buildroot}%{_datadir}/applications  \
+  --add-category Application  \
+  --add-category System  \
+  --add-category X-Red-Hat-Base  \
+  --add-category X-Red-Hat-ServerConfig  \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+echo "%{version}" > %{buildroot}/usr/share/system-config-bind/%{name}.version
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f scb.lang
-%defattr(-,root,named,-)
-/usr/share/system-config-bind
-/usr/sbin/system-config-bind
-/usr/sbin/system-config-bind-gui
-/usr/bin/system-config-bind
-/usr/bin/bindconf
-%attr(644,root,named) /usr/share/applications/system-config-bind.desktop
-%attr(644,root,named) /usr/share/icons/hicolor/48x48/apps/system-config-bind.png
-%attr(644,root,named) /etc/security/console.apps/system-config-bind
-%attr(644,root,named) /etc/security/console.apps/bindconf
-%attr(644,root,named) /etc/pam.d/bindconf
-%attr(644,root,named) /etc/pam.d/system-config-bind
-%doc scb_manual.pdf
+%defattr(-,root,root,-)
+%{_sbindir}/system-config-bind
+%{_sbindir}/system-config-bind-gui
+%{_bindir}/system-config-bind
+%{_bindir}/bindconf
+%{_datadir}/system-config-bind
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/system-config-bind.png
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-bind
+%config(noreplace) %{_sysconfdir}/security/console.apps/bindconf
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-bind
+%config(noreplace) %{_sysconfdir}/pam.d/bindconf
+%doc docs/scb_manual.pdf
+%doc COPYING
 
 %post
 if [ "$1" = "1" ]; then
-   if [ -f /etc/pam.d/bindconf ] && [ -f /etc/pam.d/system-config-bind ] && [ ! -L /etc/pam.d/bindconf ]; then
-      /bin/rm -f /etc/pam.d/bindconf;
-      /bin/ln -s /etc/pam.d/system-config-bind /etc/pam.d/bindconf;
-   fi
-   if [ -f /etc/security/console.apps/bindconf ] && [ -f /etc/security/console.apps/system-config-bind ] && [ ! -L /etc/security/console.apps/bindconf ]; then
-      /bin/rm -f /etc/security/console.apps/bindconf;
-      /bin/ln -s /etc/security/console.apps/system-config-bind /etc/security/console.apps/bindconf;
-   fi
    /bin/touch --no-create %{_datadir}/icons/hicolor
    if [ -x /usr/bin/gtk-update-icon-cache ]; then
       /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -91,21 +74,19 @@
 if [ "$1" -eq 0 ]; then
    /bin/touch --no-create %{_datadir}/icons/hicolor
    if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  	/usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+      /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor
    fi;
 fi;
 
-%triggerin -n system-config-bind -- system-config-bind <= 4.0.0-28
-if [ "$2" -gt 0 ]; then
-#  remove some CVS directories that got included by mistake, which can cause
-#  "initializing from defaults" to fail
-   [ -d /usr/share/system-config-bind/profiles/CVS ] && /bin/rm -rf /usr/share/system-config-bind/profiles/CVS;	
-   [ -d /usr/share/system-config-bind/profiles/default/CVS ] && /bin/rm -rf /usr/share/system-config-bind/profiles/default/CVS;	
-   [ -d /usr/share/system-config-bind/profiles/default/named/CVS ] && /bin/rm -rf /usr/share/system-config-bind/profiles/default/named/CVS; 
-   :;
-fi
-
 %changelog
+* Thu Feb 21 2008 Radek Brich <rbrich at redhat.com> - 4.0.5-1
+- Correct warning about format of SRV RR (bz#423761)
+- Clean up spec file, links, permissions, add COPYING (bz#226452)
+
+* Tue Jan 22 2008 Radek Brich <rbrich at redhat.com> - 4.0.4-1
+- Release 4.0.4
+- Update URL in .spec to new project page (resolves bz#237363)
+
 * Wed May 30 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2.8
 - Corrected summary in spec file (#234102)
 
@@ -186,7 +167,7 @@
 
 * Mon Nov 28 2005 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-32
 - fix bug 174284: Lookup.py failed when hostname matches IP
-		  address regexps and has no DNS record
+                  address regexps and has no DNS record
 
 * Fri Sep 23 2005 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-31
 - fix deletion of record with following records for same name
@@ -235,7 +216,7 @@
 - fix bug 156884: handle named.conf with NO options clause .
 
 * Wed Apr 27 2005 Jason Vas Dias <jvdias at redhat.com> - 4.0.0-10
-- Add User Guide & Manual in /usr/share/doc/system-config-bind-%{version}
+- Add User Guide & Manual in /usr/share/doc/system-config-bind-%%{version}
 
 * Wed Apr 27 2005 Miloslav Trmac <mitr at redhat.com> - 4.0.0-9
 - Remove dependency on 4Suite (#155113)


--- system-config-bind-4.0.2-DNSSECkey-record-column.patch DELETED ---


--- system-config-bind-4.0.2-SSHFPrecord.patch DELETED ---


--- system-config-bind-4.0.2-check-child.patch DELETED ---


--- system-config-bind-4.0.2-correct-typos.patch DELETED ---


--- system-config-bind-4.0.2-rndc-label-correction.patch DELETED ---


--- system-config-bind-4.0.2-ver.patch DELETED ---


--- system-config-bind-4.0.2-version-2.patch DELETED ---


