rpms/system-config-samba/devel .cvsignore, 1.69, 1.70 sources, 1.72, 1.73 system-config-samba.spec, 1.77, 1.78

[Nils Philippsen]

Author: nphilipp

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	28 May 2009 09:40:35 -0000	1.69
+++ .cvsignore	25 Aug 2009 12:50:39 -0000	1.70
@@ -1 +1 @@
-system-config-samba-1.2.76.tar.bz2
+system-config-samba-1.2.77.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	28 May 2009 09:40:35 -0000	1.72
+++ sources	25 Aug 2009 12:50:39 -0000	1.73
@@ -1 +1 @@
-f8ee841b850fa921a0ce2be292d3f1f6  system-config-samba-1.2.76.tar.bz2
+54f839a7638c2b8330580d0446f1ef47  system-config-samba-1.2.77.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- system-config-samba.spec	27 Jul 2009 05:25:10 -0000	1.77
+++ system-config-samba.spec	25 Aug 2009 12:50:39 -0000	1.78
@@ -1,16 +1,24 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
 %{!?python_version: %global python_version %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")}
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%bcond_without polkit1
+%endif
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%bcond_without polkitauthagent
+%endif
+
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.76
-Release: 2%{?dist}
+Version: 1.2.77
+Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildArch: noarch
-Source0: http://fedorahosted.org/releases/%(echo %{name} | %{__sed} 's@\(\(.\)\(.\).*\)@\2/\3/\1@')/%{name}-%{version}.tar.bz2
+Source0: http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
@@ -21,7 +29,7 @@ Obsoletes: system-config-samba < 1.2.68
 Conflicts: system-config-samba < 1.2.68
 Requires: dbus-python
 Requires: libselinux-python
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%if %{with polkitauthagent}
 Requires: PolicyKit-authentication-agent
 %else
 Requires: PolicyKit-gnome
@@ -29,7 +37,11 @@ Requires: PolicyKit-gnome
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
+%if %{with polkit1}
+Requires: python-slip-dbus >= 0.2.0
+%else
 Requires: python-slip-dbus >= 0.1.7
+%endif
 Requires: samba
 Requires: samba-common
 Requires: hicolor-icon-theme
@@ -46,7 +58,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%buildroot \
+%if %{with polkit1}
+    POLKIT0_SUPPORTED=0 \
+%else
+    POLKIT1_SUPPORTED=0 \
+%endif
+    install
 
 desktop-file-install --vendor system --delete-original       \
   --dir %{buildroot}%{_datadir}/applications             \
@@ -81,14 +99,21 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/system-config-samba.png
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_datadir}/dbus-1/system-services/*.service
-%{_datadir}/PolicyKit/policy/*.policy
+%if %{with polkit1}
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.services.policy
+%else
+%{_datadir}/PolicyKit/policy/org.fedoraproject.config.services.policy
+%endif
 %{python_sitelib}/scsamba
 %{python_sitelib}/scsamba-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/scsamba.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.76-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Aug 25 2009 Nils Philippsen <nils at redhat.com> - 1.2.77-1
+- support PolicyKit 1.0
+
+* Thu May 28 2009 Nils Philippsen <nils at redhat.com>
+- use simplified source URL
 
 * Thu May 28 2009 Nils Philippsen <nils at redhat.com> - 1.2.76-1
 - handle missing smb.conf (#477944)