rpms/system-config-services/devel .cvsignore, 1.37, 1.38 sources, 1.47, 1.48 system-config-services.spec, 1.48, 1.49

Nils Philippsen (nphilipp) fedora-extras-commits at redhat.com
Mon Oct 15 08:44:21 UTC 2007 

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
Merge review (#226470):
- make obsoletes versioned
- escape RPM macro in changelog
- change license tag to GPLv2+
- recoded documentation to UTF-8
- install files with correct permissions
- add release to changelog versions to appease rpmlint
- use %config(noreplace)
- use "make %{?_smp_mflags}"
- use "%defattr(-,root,root,-)"
- use xdg-open if available
pick up updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	8 Oct 2007 15:23:39 -0000	1.37
+++ .cvsignore	15 Oct 2007 08:43:48 -0000	1.38
@@ -1 +1 @@
-system-config-services-0.9.12.tar.bz2
+system-config-services-0.9.13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	8 Oct 2007 15:23:39 -0000	1.47
+++ sources	15 Oct 2007 08:43:48 -0000	1.48
@@ -1 +1 @@
-2501cb4e13f209d63def7706e1ebaf52  system-config-services-0.9.12.tar.bz2
+8c80927b861136e2f91d9e4837168911  system-config-services-0.9.13.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- system-config-services.spec	8 Oct 2007 15:23:39 -0000	1.48
+++ system-config-services.spec	15 Oct 2007 08:43:48 -0000	1.49
@@ -1,30 +1,39 @@
 # -*- RPM-SPEC -*-
 Summary: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
-Version: 0.9.12
+Version: 0.9.13
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/services
 # We are upstream, thus the source is only available from within this source
 # package.
 Source0: %{name}-%{version}.tar.bz2
-License: GPL
+License: GPLv2+
 Group: Applications/System
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /sbin/chkconfig
-Requires: pygtk2, pygtk2-libglade, rhpl
-Requires: usermode >= 1.36, usermode-gtk
+Requires: pygtk2
+Requires: pygtk2-libglade
+Requires: rhpl
+Requires: usermode >= 1.36
+Requires: usermode-gtk
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
+Requires: xdg-utils
+%else
 Requires: htmlview
+%endif
 Requires: python >= 2.3.0
 Requires(post): hicolor-icon-theme
 Requires(post): gtk2
 Requires(postun): hicolor-icon-theme
 Requires(postun): gtk2
-BuildRequires: intltool sed desktop-file-utils
+BuildRequires: intltool
+BuildRequires: sed
+BuildRequires: desktop-file-utils
 BuildRequires: perl(XML::Parser)
 BuildRequires: gettext
-Obsoletes: serviceconf
-Obsoletes: redhat-config-services
+Obsoletes: serviceconf <= 0.8.1
+Obsoletes: redhat-config-services <= 0.8.5
 
 %description
 system-config-services is a utility which allows you to configure which services
@@ -34,7 +43,7 @@
 %setup -q
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -63,7 +72,7 @@
 rm -rf %{buildroot}
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING
 %doc docs/*
 %{_sbindir}/*
@@ -71,34 +80,48 @@
 %{_datadir}/applications/system-config-services.desktop
 %{_datadir}/icons/hicolor/48x48/apps/system-config-services.png
 %{_datadir}/system-config-services
-%config %{_sysconfdir}/pam.d/system-config-services
-%config %{_sysconfdir}/security/console.apps/system-config-services
-%config %{_sysconfdir}/security/console.apps/serviceconf
-%config %{_sysconfdir}/pam.d/serviceconf
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-services
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-services
+%config(noreplace) %{_sysconfdir}/security/console.apps/serviceconf
+%config(noreplace) %{_sysconfdir}/pam.d/serviceconf
 %{_mandir}/*/system-config-services.8*
 
 %changelog
-* Mon Oct 08 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.12
+* Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.13-1
+- Merge review (#226470):
+  - make obsoletes versioned
+  - escape RPM macro in changelog
+  - change license tag to GPLv2+
+  - recoded documentation to UTF-8
+  - install files with correct permissions
+  - add release to changelog versions to appease rpmlint
+  - use %%config(noreplace)
+  - use "make %%{?_smp_mflags}"
+  - use "%%defattr(-,root,root,-)"
+  - use xdg-open if available
+- pick up updated translations
+
+* Mon Oct 08 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.12-1
 - add "make diff" ("dif") and "make shortdiff" ("sdif")
 - pull in updated translations
 
-* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.11
+* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.11-1
 - pick up updated translations
 
 * Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com>
 - make use of force tagging (since mercurial 0.9.4)
 
-* Mon Jul 23 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.10
+* Mon Jul 23 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.10-1
 - make "make archive" work with Hg
 - disable automatic ChangeLog generation
 
-* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.9
+* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.9-1
 - fix desktop file category (#245891)
 
-* Fri May 04 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.8
+* Fri May 04 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.8-1
 - pick up updated translations (#223447)
 
-* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.7
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.7-1
 - pick up updated translations
 - work around issues with UTF-8 in translatable strings (#232809)
 
@@ -111,25 +134,25 @@
 - fix licensing blurb in PO files
 - recode spec file to UTF-8
 
-* Wed Jan 31 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.6
+* Wed Jan 31 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.6-1
 - fix up service metadata reading a bit (#217591)
 
-* Wed Jan 31 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.5
+* Wed Jan 31 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.5-1
 - use "install -m" to install a lot of files without executable bits (#222579)
 
-* Wed Dec  6 2006 Harald Hoyer <harald at redhat.com> - 0.9.4
+* Wed Dec  6 2006 Harald Hoyer <harald at redhat.com> - 0.9.4-1
 - fixed service start/stop (#218429)
 - translation update (#216558)
 - Resolves: rhbz#216558, rhbz#218429
 
-* Fri Nov 24 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.3
+* Fri Nov 24 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.3-1
 - pick up updated translations (#216558)
 
-* Fri Oct 20 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.2
+* Fri Oct 20 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.2-1
 - use intltool-extract for i18n of glade files (#211248) and desktop file
   (#207345)
 
-* Tue Sep 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.1
+* Tue Sep 05 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.1-1
 - don't disable Start/Stop/Restart upon reverting changes (#202722)
 - add dist tag
 - install po files (again)
@@ -173,17 +196,17 @@
 * Fri Oct 14 2005 Nils Philippsen <nphilipp at redhat.com>
 - don't use pam_stack (#170645)
 
-* Tue Aug 16 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.26
+* Tue Aug 16 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.26-1
 - revamp getting output from external commands (#162884)
-- package %{_bindir}/serviceconf symlink (#165099)
+- package %%{_bindir}/serviceconf symlink (#165099)
 
-* Mon May 09 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.25
+* Mon May 09 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.25-1
 - pick up updated translations
 
-* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.24
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.24-1
 - make "make update-po" pick up translatable strings in desktop file (#156801)
 
-* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.23
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 0.8.23-1
 - pick up new translations
 
 * Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> - 0.8.22-2

More information about the fedora-extras-commits mailing list