plptools.spec

Śro, 29 Wrz 2004, 20:54:59 CEST

On Wed, Sep 29, 2004 at 05:28:56PM +0200, Paweł Sakowski wrote:
> On Wed, 2004-09-29 at 16:38 +0200, Bobby Spark wrote:
> > jeśli jest akceptowalne to zrobię z tego wszystkiego patcha
> 
> OK
czyli to co dorzucam i cvs_fixes i będzie spoko :D
przynajmniej mam taką nadzieję...

po{zdrowi,wodz}enia ;)
-- 
 ____      Sparky{PI]                 _   ___   _   _
/____)  ___   ___   _ _  ||          |   | _ \ | |   |
\____\ | -_) '___|  ||^' ||// \\//  <    |  _/ | |   |
(____/ ||    (_-_|_ ||   ||\\  ||    |_  |_|   |_|  _|
-------------- następna część ---------

--- SPECS/plptools.spec	2004-09-26 21:00:41.000000000 +0200
+++ SPECS/plptools.new2.spec	2004-09-29 20:46:09.824728864 +0200
@@ -10,23 +10,25 @@
 Source0:	http://dl.sourceforge.net/plptools/%{name}-%{version}.tar.gz
 # Source0-md5: 51738b3bd747a1c637cf333a8caf9292
 Source1:	%{name}.init
-Source2:	%{name}.am_edit
+Source2:	http://ep09.pld-linux.org/~djurban/kde/kde-common-admin.tar.bz2
 Patch0:		%{name}-pl.patch
-Patch1:		%{name}-c++.patch
-Patch2:		%{name}-assert.patch
-Patch3:		%{name}-kde.patch
-#Patch4:		%{name}-am_edit_fix.patch
+Patch1:		%{name}-cvs_fixes.patch
+Patch2:		%{name}-kde.patch
+Patch3:		%{name}-ac_am_fixes.patch
 URL:		http://plptools.sourceforge.net/
+BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	fam-devel
-BuildRequires:	kdelibs-devel >= 2.1
+BuildRequires:	kdelibs-devel >= 9:3.2.0
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 BuildRequires:	libstdc++-devel
 BuildRequires:	newt-devel
 BuildRequires:	qt-st-devel
 BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
+BuildRequires:	unsermake >= 040805
 BuildRequires:	/usr/bin/perl
 PreReq:		rc-scripts
 Requires(post):	/sbin/ldconfig
@@ -191,11 +193,13 @@
 
 %prep
 %setup -q
+rm -rf conf/CVS
+ln -s conf admin
+tar -jxf %{SOURCE2}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
 cp -fpr kde2/doc/en/firstwizard-1.png kde2/doc/pl
 cp -fpr kde2/doc/en/firstwizard-2.png kde2/doc/pl
 cp -fpr kde2/doc/en/firstwizard-3.png kde2/doc/pl
@@ -210,32 +214,25 @@
 cp -fpr kde2/doc/en/settings-machines.png kde2/doc/pl
 cp -fpr kde2/doc/en/toplevel.png kde2/doc/pl
 
-#it does nothing, but brakes aclocal
-sed 's/AC_DIVERSION_NOTICE/0/' \
-	-i conf/m4/plptools/PLP_HELP_MESSAGE.m4
-sed 's|^mkinstalldirs.*|mkinstalldirs = $(SHELL) $(top_srcdir)/conf/mkinstalldirs|' \
-	-i po/Makefile.in.in
-
 sed 's/lpr -Ppsion/lpr/' \
 	-i plpprint/plpprintd.cc
 
+find -name Makefile.in -exec rm "{}" ";"
+rm configure{.in,} po/Makefile.in.in
+mv {conf/,}configure.in.in
+
+touch intl/Makefile.am
 
 %build
 
 ( cd kde2/doc/pl && \
 	make -f Makefile.am index.docbook )
 
-%{__libtoolize}
-%{__aclocal} -I conf/m4/plptools -I conf/m4/kde
-%{__autoconf}
-%{__automake}
-
-install %{SOURCE2} conf/am_edit
-perl conf/am_edit -pconf
-
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
+cp -f /usr/share/automake/config.sub admin
+export UNSERMAKE=/usr/share/unsermake/unsermake
+export ACLOCALFLAGS="-I conf/m4/plptools -I conf/m4/kde"
+%{__make} -f admin/Makefile.common cvs
+
 %configure \
 	--enable-kde \
 	--with-qt-includes=/usr \
@@ -244,6 +241,10 @@
 	--x-libraries=/usr/X11R6/lib \
 	%{?debug:--enable-debug}
 
+
+( cd doc; make ncpd.8 plpnfsd.8 plpprintd.8 \
+	plpftp.1 sisinstall.1 plpbackup.1 )
+
 %{__make}
 
 %install
@@ -252,7 +253,15 @@
 install -d $RPM_BUILD_ROOT/var/spool/plpprint
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	kde_htmldir=%{_kdedocdir} \
+	kde_libs_htmldir=%{_kdedocdir} \
+	top_lib_pkgincludedir=%{_includedir}/%{name} \
+	top_plpprint_pkgdatadir=%{_datadir}/%{name} \
+	kde_icondir=%{_pixmapsdir} \
+	kde_appsdir=%{_applnkdir}
+
+rm -f doc/api/Makefile*
 
 install conf/kiodoc-update.pl \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/kiodoc-update.pl
-------------- następna część ---------
--- SOURCES/plptools-pl.patch.orig	2004-09-29 20:49:00.182830496 +0200
+++ SOURCES/plptools-pl.patch	2004-09-29 20:19:01.400287008 +0200
@@ -25,14 +25,9 @@
 diff -Nur plptools-0.12.orig/kde2/doc/kioslave/pl/Makefile.am plptools-0.12/kde2/doc/kioslave/pl/Makefile.am
 --- plptools-0.12.orig/kde2/doc/kioslave/pl/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ plptools-0.12/kde2/doc/kioslave/pl/Makefile.am	2004-09-24 01:05:00.196804952 +0200
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,2 @@
 +KDE_LANG = pl
-+kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
-+kiodoc_DATA = psion.docbook
-+EXTRA_DIST = $(kiodoc_DATA)
-+
-+maintainer-clean-local:
-+	rm -f Makefile.in
++KDE_DOCS = kioslave
 diff -Nur plptools-0.12.orig/kde2/doc/kioslave/pl/psion.docbook plptools-0.12/kde2/doc/kioslave/pl/psion.docbook
 --- plptools-0.12.orig/kde2/doc/kioslave/pl/psion.docbook	1970-01-01 01:00:00.000000000 +0100
 +++ plptools-0.12/kde2/doc/kioslave/pl/psion.docbook	2004-09-24 01:05:00.197803800 +0200
-------------- następna część ---------
diff -Nur plptools-0.12.orig/conf/configure.in.in plptools-0.12/conf/configure.in.in
--- plptools-0.12.orig/conf/configure.in.in	2003-02-03 01:29:35.000000000 +0100
+++ plptools-0.12/conf/configure.in.in	2004-09-29 19:59:53.496794864 +0200
@@ -51,7 +51,6 @@
   AC_MSG_RESULT(yes)
   AC_CHECK_LIB(bsd, hostname)
   EXTRA_OBJS=mount_aix.o
-  AC_DEFINE(_ALL_SOURCE)
 else
   AC_MSG_RESULT(no)
 fi
@@ -317,46 +316,10 @@
 	AM_CONDITIONAL(BUILD_KDE, true)
 fi
 
-AC_OUTPUT(
-	Makefile
-	intl/Makefile
-	po/Makefile.in
-	po/Makefile
-	lib/Makefile
-	ncpd/Makefile
-	plpftp/Makefile
-	plpnfsd/Makefile
-	kde2/Makefile
-	kde2/kioslave/Makefile
-	kde2/plugins/Makefile
-	kde2/kpsion/Makefile
-	kde2/klipsi/Makefile
-	kde2/po/Makefile
-	kde2/po/de/Makefile
-	kde2/mime/Makefile
-	kde2/mime/icons/Makefile
-	kde2/doc/Makefile
-	kde2/doc/en/Makefile
-	kde2/doc/de/Makefile
-	kde2/doc/kioslave/Makefile
-	kde2/doc/kioslave/de/Makefile
-	kde2/doc/kioslave/en/Makefile
-	plpbackup/Makefile
-	plpprint/Makefile
-	plpprint/prolog.ps
-	sisinstall/Makefile
-	doc/Makefile
-	doc/api/Makefile
-	etc/psion
-	etc/psion.SuSE
-	etc/psion.SuSE8
-	etc/plptools.spec
-	doc/ncpd.man
-	doc/plpnfsd.man
-	doc/plpftp.man
-	doc/sisinstall.man
-	doc/plpprintd.man
-	doc/plpbackup.man
-	debian/kpsion.1.in
-	debian/klipsi.1.in
-)
+AC_CONFIG_FILES([ plpprint/prolog.ps ])
+AC_CONFIG_FILES([ doc/ncpd.man ])
+AC_CONFIG_FILES([ doc/plpnfsd.man ])
+AC_CONFIG_FILES([ doc/plpftp.man ])
+AC_CONFIG_FILES([ doc/sisinstall.man ])
+AC_CONFIG_FILES([ doc/plpprintd.man ])
+AC_CONFIG_FILES([ doc/plpbackup.man ])
diff -Nur plptools-0.12.orig/conf/m4/plptools/PLP_HELP_MESSAGE.m4 plptools-0.12/conf/m4/plptools/PLP_HELP_MESSAGE.m4
--- plptools-0.12.orig/conf/m4/plptools/PLP_HELP_MESSAGE.m4	2001-01-27 05:02:27.000000000 +0100
+++ plptools-0.12/conf/m4/plptools/PLP_HELP_MESSAGE.m4	2004-09-29 19:49:02.401776352 +0200
@@ -2,7 +2,7 @@
 dnl Insert a custom line into the output of configure --help
 dnl
 AC_DEFUN(PLP_HELP_MSG,[
-	AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+	AC_DIVERT_PUSH(0)dnl
 	ac_help="$ac_help
 [$1]"
 	AC_DIVERT_POP()dnl
diff -Nur plptools-0.12.orig/kde2/doc/kioslave/de/Makefile.am plptools-0.12/kde2/doc/kioslave/de/Makefile.am
--- plptools-0.12.orig/kde2/doc/kioslave/de/Makefile.am	2002-08-10 21:13:41.000000000 +0200
+++ plptools-0.12/kde2/doc/kioslave/de/Makefile.am	2004-09-29 20:13:16.068785376 +0200
@@ -1,7 +1,2 @@
 KDE_LANG = de
-kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
-kiodoc_DATA = psion.docbook
-EXTRA_DIST = $(kiodoc_DATA)
-
-maintainer-clean-local:
-	rm -f Makefile.in
+KDE_DOCS = kioslave
diff -Nur plptools-0.12.orig/kde2/doc/kioslave/en/Makefile.am plptools-0.12/kde2/doc/kioslave/en/Makefile.am
--- plptools-0.12.orig/kde2/doc/kioslave/en/Makefile.am	2002-08-10 21:13:47.000000000 +0200
+++ plptools-0.12/kde2/doc/kioslave/en/Makefile.am	2004-09-29 20:13:22.881749648 +0200
@@ -1,7 +1,2 @@
 KDE_LANG = en
-kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
-kiodoc_DATA = psion.docbook
-EXTRA_DIST = $(kiodoc_DATA)
-
-maintainer-clean-local:
-	rm -f Makefile.in
+KDE_DOCS = kioslave
diff -Nur plptools-0.12.orig/kde2/kioslave/Makefile.am plptools-0.12/kde2/kioslave/Makefile.am
--- plptools-0.12.orig/kde2/kioslave/Makefile.am	2003-02-03 15:34:06.000000000 +0100
+++ plptools-0.12/kde2/kioslave/Makefile.am	2004-09-29 19:51:03.432376904 +0200
@@ -3,7 +3,7 @@
 maintainer-clean-local:
 	rm -f Makefile.in *.closure
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/lib
+INCLUDES = $(all_includes) -I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 kdemoduledir = $(kde_moduledir)
 kdemodule_LTLIBRARIES = kio_plp.la
diff -Nur plptools-0.12.orig/kde2/klipsi/Makefile.am plptools-0.12/kde2/klipsi/Makefile.am
--- plptools-0.12.orig/kde2/klipsi/Makefile.am	2002-08-11 07:26:27.000000000 +0200
+++ plptools-0.12/kde2/klipsi/Makefile.am	2004-09-29 20:02:21.439304184 +0200
@@ -1,15 +1,13 @@
-libdir=$(kde_libraries)
  
-bindir=$(kde_bindir)
   
 maintainer-clean-local:
 	rm -f Makefile.in
 	   
-METASOURCES = AUTO
+klipsi_METASOURCES = AUTO
 	    
 KDE_ICON = AUTO
 	     
-INCLUDES = $(all_includes) -I$(top_srcdir)/lib
+INCLUDES = $(all_includes) -I$(top_srcdir)/lib -I$(top_srcdir)/include
 	      
 DISTCLEANFILES = $(klipsi_METASOURCES) ./.deps/* ./.deps/.P
 
diff -Nur plptools-0.12.orig/kde2/kpsion/Makefile.am plptools-0.12/kde2/kpsion/Makefile.am
--- plptools-0.12.orig/kde2/kpsion/Makefile.am	2002-08-11 10:55:31.000000000 +0200
+++ plptools-0.12/kde2/kpsion/Makefile.am	2004-09-29 20:02:11.878757608 +0200
@@ -1,17 +1,15 @@
 # $Id: Makefile.am,v 1.15 2002/08/11 08:55:31 felfert Exp $
 
-libdir=$(kde_libraries)
 
-bindir=$(kde_bindir)
 
 maintainer-clean-local:
 	rm -f Makefile.in
 
-METASOURCES = AUTO
+kpsion_METASOURCES = AUTO
 
 KDE_ICON = AUTO
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/lib
+INCLUDES = $(all_includes) -I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 DISTCLEANFILES = $(kpsion_METASOURCES) ./.deps/* ./.deps/.P
 
diff -Nur plptools-0.12.orig/kde2/plugins/Makefile.am plptools-0.12/kde2/plugins/Makefile.am
--- plptools-0.12.orig/kde2/plugins/Makefile.am	2002-08-11 07:27:13.000000000 +0200
+++ plptools-0.12/kde2/plugins/Makefile.am	2004-09-29 19:51:03.453373712 +0200
@@ -1,5 +1,5 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/lib
+INCLUDES = $(all_includes) -I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 kdemoduledir = $(kde_moduledir)
 kdemodule_LTLIBRARIES = libplpprops.la
diff -Nur plptools-0.12.orig/lib/Makefile.am plptools-0.12/lib/Makefile.am
--- plptools-0.12.orig/lib/Makefile.am	2002-07-16 09:38:20.000000000 +0200
+++ plptools-0.12/lib/Makefile.am	2004-09-29 19:53:22.767194792 +0200
@@ -1,8 +1,6 @@
 # $Id: Makefile.am,v 1.18 2002/07/16 05:57:58 felfert Exp $
 #
-INCLUDES = -I$(top_srcdir)/intl
-CFLAGS = $(THREADED_CFLAGS)
-CXXFLAGS = $(THREADED_CXXFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libplp.la
 
diff -Nur plptools-0.12.orig/ncpd/Makefile.am plptools-0.12/ncpd/Makefile.am
--- plptools-0.12.orig/ncpd/Makefile.am	2002-08-11 10:55:31.000000000 +0200
+++ plptools-0.12/ncpd/Makefile.am	2004-09-29 19:53:22.773193880 +0200
@@ -1,8 +1,6 @@
 # $Id: Makefile.am,v 1.13 2002/08/11 08:55:31 felfert Exp $
 #
-INCLUDES=-I$(top_srcdir)/lib
-CFLAGS = $(THREADED_CFLAGS)
-CXXFLAGS = $(THREADED_CXXFLAGS)
+INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 sbin_PROGRAMS = ncpd
 
diff -Nur plptools-0.12.orig/plpbackup/Makefile.am plptools-0.12/plpbackup/Makefile.am
--- plptools-0.12.orig/plpbackup/Makefile.am	2002-08-11 10:55:31.000000000 +0200
+++ plptools-0.12/plpbackup/Makefile.am	2004-09-29 19:51:03.464372040 +0200
@@ -1,6 +1,6 @@
 # $Id: Makefile.am,v 1.4 2002/08/11 08:55:31 felfert Exp $
 #
-INCLUDES=-I$(top_srcdir)/lib
+INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 bin_PROGRAMS = plpbackup
 plpbackup_LDADD = $(LIB_PLP)
diff -Nur plptools-0.12.orig/plpftp/Makefile.am plptools-0.12/plpftp/Makefile.am
--- plptools-0.12.orig/plpftp/Makefile.am	2002-08-11 10:55:31.000000000 +0200
+++ plptools-0.12/plpftp/Makefile.am	2004-09-29 19:51:03.474370520 +0200
@@ -1,6 +1,6 @@
 # $Id: Makefile.am,v 1.12 2002/08/11 08:55:31 felfert Exp $
 #
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/include
 
 bin_PROGRAMS = plpftp
 plpftp_LDADD = $(LIB_PLP) $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS)
diff -Nur plptools-0.12.orig/plpnfsd/Makefile.am plptools-0.12/plpnfsd/Makefile.am
--- plptools-0.12.orig/plpnfsd/Makefile.am	2002-08-11 10:55:31.000000000 +0200
+++ plptools-0.12/plpnfsd/Makefile.am	2004-09-29 19:51:03.485368848 +0200
@@ -1,6 +1,6 @@
 # $Id: Makefile.am,v 1.10 2002/08/11 08:55:31 felfert Exp $
 #
-INCLUDES=-I$(top_srcdir)/lib
+INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 sbin_PROGRAMS = plpnfsd
 plpnfsd_LDADD = $(LIB_PLP)
diff -Nur plptools-0.12.orig/plpprint/Makefile.am plptools-0.12/plpprint/Makefile.am
--- plptools-0.12.orig/plpprint/Makefile.am	2002-08-11 10:55:31.000000000 +0200
+++ plptools-0.12/plpprint/Makefile.am	2004-09-29 19:51:03.490368088 +0200
@@ -1,6 +1,6 @@
 # $Id: Makefile.am,v 1.5 2002/08/11 08:55:31 felfert Exp $
 #
-INCLUDES=-I$(top_srcdir)/lib
+INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 sbin_PROGRAMS = plpprintd
 plpprintd_LDADD = $(LIB_PLP)
diff -Nur plptools-0.12.orig/po/Makefile.am plptools-0.12/po/Makefile.am
--- plptools-0.12.orig/po/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ plptools-0.12/po/Makefile.am	2004-09-29 19:51:03.355388608 +0200
@@ -0,0 +1 @@
+POFILES = AUTO
diff -Nur plptools-0.12.orig/sisinstall/Makefile.am plptools-0.12/sisinstall/Makefile.am
--- plptools-0.12.orig/sisinstall/Makefile.am	2002-07-06 20:39:34.000000000 +0200
+++ plptools-0.12/sisinstall/Makefile.am	2004-09-29 19:51:03.480369608 +0200
@@ -1,11 +1,11 @@
 # $Id: Makefile.am,v 1.7 2002/04/14 06:57:01 basic Exp $
 #
-INCLUDES=-I$(top_srcdir)/lib
+INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
 
 bin_PROGRAMS = sisinstall
 sisinstall_LDADD = $(top_srcdir)/lib/libplp.la $(LIBNEWT)
 sisinstall_SOURCES = psion.cpp sisinstaller.cpp sismain.cpp \
-	fakepsion.cpp sisfilelink.cpp sisfilelink.h
+	fakepsion.cpp sisfilelink.cpp 
 EXTRA_DIST = psion.h sisinstaller.h fakepsion.h
 
 maintainer-clean-local:
