rpms/system-config-samba/devel .cvsignore, 1.48, 1.49 sources, 1.49, 1.50 system-config-samba.spec, 1.53, 1.54

Nils Philippsen (nphilipp) fedora-extras-commits at redhat.com
Fri Oct 12 08:43:08 UTC 2007 

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
Merge review (#226468)
- use xdg-open if available
- obsolete redhat-config-samba with version
- change license tag to GPLv2
- install most python files not as executable
- use %config(noreplace)
- add release tags to changelog entries to appease rpmlint
- use "make %{?_smp_mflags}"



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	8 Oct 2007 15:28:57 -0000	1.48
+++ .cvsignore	12 Oct 2007 08:42:36 -0000	1.49
@@ -1 +1 @@
-system-config-samba-1.2.54.tar.bz2
+system-config-samba-1.2.55.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	8 Oct 2007 15:28:57 -0000	1.49
+++ sources	12 Oct 2007 08:42:36 -0000	1.50
@@ -1 +1 @@
-480475ddbeea068262c3e75752f8059f  system-config-samba-1.2.54.tar.bz2
+801730ea97a7ca60ad8f461e02bad1bb  system-config-samba-1.2.55.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- system-config-samba.spec	8 Oct 2007 15:28:57 -0000	1.53
+++ system-config-samba.spec	12 Oct 2007 08:42:36 -0000	1.54
@@ -1,9 +1,9 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.54
+Version: 1.2.55
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
-License: GPL
+License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
@@ -14,7 +14,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
-Obsoletes: redhat-config-samba
+Obsoletes: redhat-config-samba < 1.1.5
 Requires: pygtk2
 Requires: pygtk2-libglade
 Requires: python
@@ -26,7 +26,11 @@
 %else
 Requires: libuser
 %endif
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+Requires: xdg-utils
+%else
 Requires: htmlview
+%endif
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
 
@@ -38,7 +42,7 @@
 %setup -q
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -69,29 +73,38 @@
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %doc doc/*
-/usr/bin/system-config-samba
-%dir /usr/share/system-config-samba
-/usr/share/system-config-samba/*
-%attr(0644,root,root) %{_datadir}/applications/system-config-samba.desktop
-%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-samba.png
-%attr(0644,root,root) %config /etc/security/console.apps/system-config-samba
-%attr(0644,root,root) %config /etc/pam.d/system-config-samba
+%{_bindir}/system-config-samba
+%{_datadir}/system-config-samba
+%{_datadir}/applications/system-config-samba.desktop
+%{_datadir}/icons/hicolor/48x48/apps/system-config-samba.png
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-samba
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-samba
 
 %changelog
-* Mon Oct 08 2007 Nils Philippsen <nphilipp at redhat.com>
+* Fri Oct 12 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.55-1
+- Merge review (#226468)
+  - use xdg-open if available
+  - obsolete redhat-config-samba with version
+  - change license tag to GPLv2
+  - install most python files not as executable
+  - use %%config(noreplace)
+  - add release tags to changelog entries to appease rpmlint
+  - use "make %%{?_smp_mflags}"
+
+* Mon Oct 08 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.54-1
 - add "make diff" ("dif") and "make shortdiff" ("sdif")
 - pull in updated translations
 
-* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.53
+* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.53-1
 - pick up updated translations
 
-* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.52
+* Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.52-1
 - pick up updated translations
 
-* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51-1
 - update Polish, Serbian translations
 - $RPM_BUILD_ROOT -> %%{buildroot}
 - don't add distro specific desktop categories from Fedora 8 on (#277591)
@@ -99,13 +112,13 @@
 - require libuser-python from Fedora 8 on (#251354)
 - make use of force tagging (since mercurial 0.9.4)
 
-* Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
+* Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50-1
 - bundle the GPL
 
-* Thu Aug 30 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.49
+* Thu Aug 30 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.49-1
 - pull in updated translations
 
-* Tue Aug 28 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.48
+* Tue Aug 28 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.48-1
 - gracefully handle unknown configuration options (#247541)
 
 * Mon Aug 27 2007 Nils Philippsen <nphilipp at redhat.com>
@@ -113,38 +126,38 @@
   (#253464)
 - don't remove *.pyc files upon uninstalling the package (#256401)
 
-* Mon Aug 13 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.47
+* Mon Aug 13 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.47-1
 - improve detection of commented out default values (#251477)
 - use non-capital default values
 - preserve whitespace better in comments
 - don't use string module but str methods in sambaParser module
 
-* Thu Aug 09 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.46
+* Thu Aug 09 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.46-1
 - honour default values in share window (#251477)
 - try to deal sanely with commented out default values
 - don't canonicalize key names when writing smb.conf
 
-* Mon Jul 23 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.45
+* Mon Jul 23 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.45-1
 - make "make archive" work with Hg
 
-* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.44
+* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.44-1
 - use gtk.FileChooseDialog instead of gtk.FileSelection (#245916, patch by Adel
   Gadllah)
 
-* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.43
+* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.43-1
 - fix desktop file category (#245890)
 
-* Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.42
+* Thu Jun 14 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.42-1
 - don't mask workgroup key when set to default value "workgroup" (#244169)
 
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com>
 - don't mark stuff translatable where it doesn't make sense (#237277)
 - merge translatable strings that only differ in case (#237275)
 
-* Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.41
+* Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.41-1
 - cope with separate nmb service (#234687)
 
-* Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.40
+* Tue Apr 17 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.40-1
 - don't access smbpasswd directly but use pdbedit to allow for tdb/ldap
   backends (#236557)
 
@@ -156,31 +169,31 @@
 - clean buildroot before installing
 - fix licensing blurb in PO files
 
-* Mon Jan 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.39
+* Mon Jan 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.39-1
 - handle synonyms and inverted synonyms gracefully (#222595)
 
-* Wed Jan 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.38
+* Wed Jan 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.38-1
 - get list of configuration parameters and defaults from testparm, fix
   duplicate dict keys (#219308)
 
-* Tue Dec 12 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.37
+* Tue Dec 12 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.37-1
 - pick up updated translations (#216611)
 
-* Fri Nov 24 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.36
+* Fri Nov 24 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.36-1
 - pick up updated translations (#216611)
 - add dist tag
 
-* Wed Mar 29 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.35
+* Wed Mar 29 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.35-1
 - don't require gnome module (#187200)
 - don't wrap text in About dialog
 
-* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.34
+* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.34-1
 - require hicolor-icon-theme (#182874, #182875)
 
-* Mon Feb 06 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.33
+* Mon Feb 06 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.33-1
 - fix typo in PAM file (#179937)
 
-* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.32
+* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.32-1
 - bump version
 
 * Thu Dec 22 2005 Nils Philippsen <nphilipp at redhat.com>
@@ -196,10 +209,10 @@
 * Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com>
 - make desktop file rebuild consistently
 
-* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 1.2.31
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 1.2.31-1
 - use DESTDIR consistently
 
-* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 1.2.30
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 1.2.30-1
 - make desktop file translatable (#156798)
 
 * Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> - 1.2.29-2

More information about the fedora-extras-commits mailing list