rpms/system-config-nfs/devel .cvsignore, 1.43, 1.44 sources, 1.50, 1.51 system-config-nfs.spec, 1.55, 1.56

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
fix distinguishing between BR: rarian-compat and BR: scrollkeeper



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	18 Jan 2008 16:35:58 -0000	1.43
+++ .cvsignore	29 Jan 2008 16:32:26 -0000	1.44
@@ -1 +1 @@
-system-config-nfs-1.3.36.tar.bz2
+system-config-nfs-1.3.37.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	19 Jan 2008 13:21:45 -0000	1.50
+++ sources	29 Jan 2008 16:32:26 -0000	1.51
@@ -1 +1 @@
-e7e5fac10d424b24f7fbe83479e796dc  system-config-nfs-1.3.36.tar.bz2
+84c62931e11bbeff60d0b769fdebc890  system-config-nfs-1.3.37.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- system-config-nfs.spec	19 Jan 2008 13:21:45 -0000	1.55
+++ system-config-nfs.spec	29 Jan 2008 16:32:26 -0000	1.56
@@ -1,20 +1,20 @@
 # Command line configurables
 
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
-%bcond_without console_util
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%bcond_without rarian_compat
 %else
-%bcond_with console_util
+%bcond_with rarian_compat
 %endif
 
-%if 0%{?fedora} < 8 || 0%{?rhel} < 6
-%bcond_without scrollkeeper
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 9 || 0%{?rhel} >= 6
+%bcond_without console_util
 %else
-%bcond_with scrollkeeper
+%bcond_with console_util
 %endif
 
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.36
+Version: 1.3.37
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/nfs
 License: GPLv2+
@@ -30,10 +30,10 @@
 BuildRequires: python
 BuildRequires: gnome-doc-utils
 BuildRequires: docbook-dtds
-%if %{with scrollkeeper}
-BuildRequires: scrollkeeper
-%else
+%if %{with rarian_compat}
 BuildRequires: rarian-compat
+%else
+BuildRequires: scrollkeeper
 %endif
 Obsoletes: redhat-config-nfs < 1.1.4
 Requires: pygtk2
@@ -98,6 +98,9 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-nfs
 
 %changelog
+* Tue Jan 29 2008 Nils Philippsen <nphilipp at redhat.com> - 1.3.37-1
+- fix distinguishing between BR: rarian-compat and BR: scrollkeeper
+
 * Fri Jan 18 2008 Nils Philippsen <nphilipp at redhat.com> - 1.3.36-1
 - migrate online help to yelp/Docbook XML