- popt patch: use shared libpopt

- adapterized, rpm automation (man gzipping), %%{debug} ready

Changed files:
    chkconfig-popt.patch -> 1.1
    chkconfig-rcdir.patch -> 1.1
    chkconfig.spec -> 1.33

diff --git a/chkconfig-popt.patch b/chkconfig-popt.patch
new file mode 100644 (file)
index 0000000..63f547f
--- /dev/null
+++ b/chkconfig-popt.patch
@@ -0,0 +1,12 @@
+diff -Nur chkconfig-1.2.16.orig/Makefile chkconfig-1.2.16/Makefile
+--- chkconfig-1.2.16.orig/Makefile     Fri Mar 16 17:08:02 2001
++++ chkconfig-1.2.16/Makefile  Fri Mar 16 17:11:03 2001
+@@ -22,7 +22,7 @@
+       done && test -z "$$fail"
+ 
+ chkconfig: $(OBJS)
+-      $(CC) $(LDFLAGS) -o chkconfig $(OBJS) /usr/lib/libpopt.a
++      $(CC) $(LDFLAGS) -o chkconfig $(OBJS) -lpopt
+ 
+ ntsysv: $(NTOBJS)
+       $(CC) $(LDFLAGS) -o ntsysv $(NTOBJS) -lnewt -lpopt $(LIBMHACK)

diff --git a/chkconfig-rcdir.patch b/chkconfig-rcdir.patch
new file mode 100644 (file)
index 0000000..8059898
--- /dev/null
+++ b/chkconfig-rcdir.patch
@@ -0,0 +1,11 @@
+--- chkconfig-1.2.16/leveldb.h.orig    Mon Jul  3 07:57:04 2000
++++ chkconfig-1.2.16/leveldb.h Fri Mar 16 17:34:05 2001
+@@ -1,7 +1,7 @@
+ #ifndef H_LEVELDB
+ #define H_LEVELDB
+ 
+-#define RUNLEVELS "/etc"
++#define RUNLEVELS "/etc/rc.d"
+ #define XINETDDIR "/etc/xinetd.d"
+ 
+ #include <glob.h>

diff --git a/chkconfig.spec b/chkconfig.spec
index a2b2b0e26d3c218dbfdabc6cff3f4af31cdd852f..127fe737d33e49a3ceffdbccee616d70c28deb91 100644 (file)
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -8,13 +8,16 @@ Name:         chkconfig
 Version:       1.2.16
 Release:       1
 License:       GPL
-Group:         Utilities/System
+Group:         Applications/System
+Group(de):     Applikationen/System
+Group(pl):     Aplikacje/System
 Group(pt):     Utilitários/Sistema
-Group(pl):     Narzêdzia/System
 Source0:       ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz
-Patch0:                chkconfig-opt.patch
-Patch1:                chkconfig-fhs.patch
-Patch2:                chkconfig-add.patch
+Patch0:                %{name}-opt.patch
+Patch1:                %{name}-fhs.patch
+Patch2:                %{name}-add.patch
+Patch3:                %{name}-popt.patch
+Patch4:                %{name}-rcdir.patch
 BuildRequires: slang-devel
 BuildRequires: newt-devel
 BuildRequires: popt-devel
@@ -39,7 +42,7 @@ syst
 
 %description -l pl
 Pakiet chkconfig udostêpnia proste narzêdzia do zarz±dzania
-zawarto¶ci± katalogów w /etc/rc.d
+zawarto¶ci± katalogów w /etc/rc.d .
 
 %description -l pt_BR
 Chkconfig provê uma ferramenta simples na linha de comando para manter
@@ -54,11 +57,12 @@ hafifletir.
 
 %package -n ntsysv
 Summary:       Full-screen interface for configurating runlevel information
-Summary(pt):   Interface com menus para configuração de informações de \
-Summary(pt):   níveis de execução
-Group:         Utilities/System
+Summary(pl):   Pe³noekranowy interfejs do wybierania dzia³aj±cych us³ug systemowych
+Summary(pt):   Interface com menus para configuração de informações de níveis de execução
+Group:         Applications/System
+Group(de):     Applikationen/System
+Group(pl):     Aplikacje/System
 Group(pt):     Utilitários/Sistema
-Group(pl):     Narzêdzia/System
 Requires:      %{name} = %{version}
 
 %description -n ntsysv
@@ -81,6 +85,8 @@ termina
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -88,7 +94,9 @@ termina
 LIBMHACK=-lm
 %endif
 
-make   OPTIMIZE="$RPM_OPT_FLAGS" \
+%{__make} \
+       OPTIMIZE="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" \
+       LDFLAGS="%{!?debug:-s}" \
        LIBMHACK="$LIBMHACK"
 
 %install
@@ -98,8 +106,6 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/{init,rc{0,1,2,3,4,5,6}}.d
 %{__make} install \
     instroot=$RPM_BUILD_ROOT
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man8/*
-
 %find_lang %{name}
 
 %clean
@@ -113,5 +119,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ntsysv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/ntsysv
-
 %{_mandir}/man8/ntsysv.8*