From 678f931a0305aa2940ab5dcd74b1b2f0a72b3244 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Aug 24 2010 12:43:55 +0000
Subject: version 1.2.90


---

diff --git a/.gitignore b/.gitignore
index 3716a42..4cae1c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 system-config-samba-1.2.89.tar.bz2
+/system-config-samba-1.2.90.tar.bz2
diff --git a/sources b/sources
index 37425da..13a541f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ece041901c8e2362962b3924dbc62a53  system-config-samba-1.2.89.tar.bz2
+5aafdd10eb57922a119bfd41d481e5e4  system-config-samba-1.2.90.tar.bz2
diff --git a/system-config-samba.spec b/system-config-samba.spec
index 7d7eaad..7417ad8 100644
--- a/system-config-samba.spec
+++ b/system-config-samba.spec
@@ -5,10 +5,17 @@
 %bcond_without polkit1
 %endif
 
+# Enterprise versions pull in docs automatically
+%if 0%{?rhel} > 0
+%bcond_without require_docs
+%else
+%bcond_with require_docs
+%endif
+
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.89
-Release: 2%{?dist}
+Version: 1.2.90
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
@@ -26,6 +33,9 @@ Obsoletes: redhat-config-samba < 1.1.5
 # 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
+%if %{with require_docs}
+Requires: system-config-samba-docs
+%endif
 Requires: dbus-python
 Requires: pygtk2
 Requires: pygtk2-libglade
@@ -99,8 +109,14 @@ fi
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.2.89-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+* Tue Aug 24 2010 Nils Philippsen <nils@redhat.com> - 1.2.90-1
+- pick up translation updates
+
+* Wed Jun 30 2010 Nils Philippsen <nils@redhat.com>
+- require docs in enterprise builds
+
+* Wed Apr 28 2010 Nils Philippsen <nils@redhat.com>
+- use different labels/shortcuts (#479486, #479487)
 
 * Mon Apr 19 2010 Nils Philippsen <nils@redhat.com> - 1.2.89-1
 - don't use string methods on unicode objects (#579279)