- let's keep obsoletes in one place, basesystem is imo better for that

[packages/setup.git] / setup.spec

diff --git a/setup.spec b/setup.spec
index 28b10948658a4456316b0394c4a55757a281d387..a8a5ea433af6f5ead0be7c34efaf5c99f57cebbd 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -5,7 +5,7 @@
 # Conditional build:
 %bcond_with    ssp     # enable stack-smashing protector (vide dietlibc.spec)
 #
-%define        iana_etc_ver    1.03
+%define        iana_etc_ver    1.04
 #
 Summary:       Simple setup files
 Summary(de):   Einfache Setup-Dateien
@@ -16,24 +16,22 @@ Summary(pl):        Podstawowe pliki systemu Linux
 Summary(pt_BR):        Vários arquivos básicos de configuração
 Summary(tr):   Basit kurulum dosyalarý
 Name:          setup
-Version:       2.4.8
-Release:       0.1
+Version:       2.4.9
+Release:       2
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       http://mieszkancy.ds.pg.gda.pl/~blues/SOURCES/%{name}-%{version}.tar.bz2
-# Source0-md5: 97b906b6558920b77947a994c2bf859f
+# Source0-md5: aa99796a603e10343edbf0720edfd6ac
 Source1:       http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
-# Source1-md5: 670da9e41179d618498f5d614b7f4636
+# Source1-md5: 9f769f7b2d0e519cf62dacb2b3b051d4
+# This is source of non-iana changes in services file
+#Patch0:               %{name}-services.patch
 BuildRequires: dietlibc-static
 BuildRequires: gawk
 Conflicts:     FHS < 2.3
 AutoReqProv:   no
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch alpha
-Obsoletes:     gfax
-%endif
-
 %define                _sbindir        /sbin
 
 %description
@@ -88,7 +86,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d
        DESTDIR=$RPM_BUILD_ROOT
 
 install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT/etc/protocols
-install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT/etc/services
+# don't overwrite files from setup tar-ball, fix it in original tar!
+#install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT/etc/services
 
 %clean
 rm -rf $RPM_BUILD_ROOT