rpms/system-config-samba/devel .cvsignore, 1.70, 1.71 sources, 1.74, 1.75 system-config-samba.spec, 1.79, 1.80

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv636

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
version 1.2.78


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- .cvsignore	25 Aug 2009 12:50:39 -0000	1.70
+++ .cvsignore	26 Aug 2009 15:04:18 -0000	1.71
@@ -1 +1 @@
-system-config-samba-1.2.77.tar.bz2
+system-config-samba-1.2.78.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	25 Aug 2009 13:13:04 -0000	1.74
+++ sources	26 Aug 2009 15:04:18 -0000	1.75
@@ -1 +1 @@
-73a1bc0f717cc68967b483793dcf7d6c  system-config-samba-1.2.77.tar.bz2
+94caa6dd58d19b5ba215d5ad0697ef31  system-config-samba-1.2.78.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- system-config-samba.spec	25 Aug 2009 13:13:04 -0000	1.79
+++ system-config-samba.spec	26 Aug 2009 15:04:19 -0000	1.80
@@ -11,7 +11,7 @@
 
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.77
+Version: 1.2.78
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -25,8 +25,11 @@ BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
 Obsoletes: redhat-config-samba < 1.1.5
+# Until version 1.2.67, system-config-samba contained online documentation.
+# From version 1.2.68 on, online documentation is split off into its own
+# package system-config-samba-docs. The following ensures that updating from
+# earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-samba < 1.2.68
-Conflicts: system-config-samba < 1.2.68
 Requires: dbus-python
 Requires: libselinux-python
 %if %{with polkitauthagent}
@@ -109,6 +112,12 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com> - 1.2.78-1
+- use gettext instead of rhpl
+
+* Wed Aug 26 2009 Nils Philippsen <nils at redhat.com>
+- explain obsoleting old versions
+
 * Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 1.2.77-1
 - fix file list