SPECS: syslinux.spec, tinyerp-server.spec, ulogd.spec, vhcs2.spec, ...

glen glen at pld-linux.org
Wed Jul 26 17:56:42 CEST 2006 

Author: glen                         Date: Wed Jul 26 15:56:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- remove extra unneeded slash

---- Files affected:
SPECS:
   syslinux.spec (1.68 -> 1.69) , tinyerp-server.spec (1.16 -> 1.17) , ulogd.spec (1.36 -> 1.37) , vhcs2.spec (1.8 -> 1.9) , vtk.spec (1.8 -> 1.9) , webCDwriter.spec (1.43 -> 1.44) , wxMaxima.spec (1.2 -> 1.3) , xchat-gnome.spec (1.15 -> 1.16) , xemacs-auctex-pkg.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/syslinux.spec
diff -u SPECS/syslinux.spec:1.68 SPECS/syslinux.spec:1.69
--- SPECS/syslinux.spec:1.68	Fri Oct 21 16:20:53 2005
+++ SPECS/syslinux.spec	Wed Jul 26 17:56:36 2006
@@ -11,8 +11,8 @@
 Source0:	ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
 # Source0-md5:	513ff71287a4397d507879a1a836c2e8
 URL:		http://syslinux.zytor.com/
-BuildRequires:	perl-base
 BuildRequires:	nasm
+BuildRequires:	perl-base
 BuildRequires:	sed >= 4.0
 Requires:	mtools
 ExclusiveArch:	%{ix86} %{x8664}
@@ -70,9 +70,8 @@
 
 %description devel -l pl
 Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilowania
-aplikacji wykorzystujących kod syslinuksa. Należy go instalować
-tylko jeśli chcemy tworzyć lub kompilować własnych klientów
-syslinuksa.
+aplikacji wykorzystujących kod syslinuksa. Należy go instalować tylko
+jeśli chcemy tworzyć lub kompilować własnych klientów syslinuksa.
 
 %prep
 %setup -q
@@ -86,13 +85,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_includedir}}
-install ldlinux.sys $RPM_BUILD_ROOT/%{_libdir}/%{name}
+install ldlinux.sys $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 %{__make} install-all \
 	INSTALLROOT=$RPM_BUILD_ROOT \
 	LIBDIR=%{_libdir}
 
-install extlinux/extlinux $RPM_BUILD_ROOT/%{_bindir}
+install extlinux/extlinux $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.68  2005/10/21 14:20:53  darekr
 - BR: sed 4.0
 - defined _sbindir to /sbin, use macro

================================================================
Index: SPECS/tinyerp-server.spec
diff -u SPECS/tinyerp-server.spec:1.16 SPECS/tinyerp-server.spec:1.17
--- SPECS/tinyerp-server.spec:1.16	Fri Feb  3 22:59:51 2006
+++ SPECS/tinyerp-server.spec	Wed Jul 26 17:56:36 2006
@@ -16,12 +16,12 @@
 BuildRequires:	python-libxml2
 BuildRequires:	python-libxslt
 BuildRequires:	python-psycopg
-BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	python-pydot
+BuildRequires:	rpmbuild(macros) >= 1.219
+Requires:	python-ReportLab
 Requires:	python-libxml2
 Requires:	python-libxslt
 Requires:	python-psycopg
-Requires:	python-ReportLab
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -54,19 +54,19 @@
 
 %py_postclean
 
-install -d $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/addons/{base/report,base_partner_relation,edi/{report,wizard},sale/report,esale,network/report,account/{data,datas},purchase/report,audittrail,scrum,account.old/{datas,report,project},delivery,product,product_electronic,product_expiry}
+install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/addons/{base/report,base_partner_relation,edi/{report,wizard},sale/report,esale,network/report,account/{data,datas},purchase/report,audittrail,scrum,account.old/{datas,report,project},delivery,product,product_electronic,product_expiry}
 
 cd bin/
 for i in `find -name *.xml`; do
-	install $i $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/`echo $i | sed 's/\.//'`
+	install $i $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/`echo $i | sed 's/\.//'`
 done
 
 for i in `find -name *.xsl`; do
-	install $i $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/`echo $i | sed 's/\.//'`
+	install $i $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/`echo $i | sed 's/\.//'`
 done
 
 for i in `find -name *.sql`; do
-	install $i $RPM_BUILD_ROOT/%{py_sitescriptdir}/%{name}/`echo $i | sed 's/\.//'`
+	install $i $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}/`echo $i | sed 's/\.//'`
 done
 
 #%%find_lang %{name}
@@ -87,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.16  2006/02/03 21:59:51  djrzulf
 - builds,
 

================================================================
Index: SPECS/ulogd.spec
diff -u SPECS/ulogd.spec:1.36 SPECS/ulogd.spec:1.37
--- SPECS/ulogd.spec:1.36	Mon Mar 27 14:41:23 2006
+++ SPECS/ulogd.spec	Wed Jul 26 17:56:36 2006
@@ -81,7 +81,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ulogd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ulogd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/ulogd
-install -D %{name}.8 $RPM_BUILD_ROOT/%{_mandir}/man8/%{name}.8
+install -D %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 
 touch $RPM_BUILD_ROOT/var/log/ulogd{,.pktlog}
 
@@ -130,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.36  2006/03/27 12:41:23  glen
 - rel 3 (libmysqlclient_15)
 

================================================================
Index: SPECS/vhcs2.spec
diff -u SPECS/vhcs2.spec:1.8 SPECS/vhcs2.spec:1.9
--- SPECS/vhcs2.spec:1.8	Tue Jul 25 16:50:11 2006
+++ SPECS/vhcs2.spec	Wed Jul 26 17:56:36 2006
@@ -107,31 +107,31 @@
 ### ENGINE:
 # Some scripts:
 install engine/traffic/maillogconvert/maillogconvert.pl $RPM_BUILD_ROOT%{_sbindir}
-install engine/vhcs2_common_code.pl $RPM_BUILD_ROOT/%{_appdir}/engine
-install engine/vhcs2-db-keys.pl $RPM_BUILD_ROOT/%{_appdir}/engine
-install engine/vhcs2-db-keys.pl $RPM_BUILD_ROOT/%{_appdir}/engine/messager
-install engine/*-mngr $RPM_BUILD_ROOT/%{_appdir}/engine
-install engine/vhcs2-db-passwd $RPM_BUILD_ROOT/%{_appdir}/engine
+install engine/vhcs2_common_code.pl $RPM_BUILD_ROOT%{_appdir}/engine
+install engine/vhcs2-db-keys.pl $RPM_BUILD_ROOT%{_appdir}/engine
+install engine/vhcs2-db-keys.pl $RPM_BUILD_ROOT%{_appdir}/engine/messager
+install engine/*-mngr $RPM_BUILD_ROOT%{_appdir}/engine
+install engine/vhcs2-db-passwd $RPM_BUILD_ROOT%{_appdir}/engine
 # Backup scripts:
-install engine/backup/vhcs2-bk-task $RPM_BUILD_ROOT/%{_appdir}/engine/backup
-install engine/backup/vhcs2-backup-all $RPM_BUILD_ROOT/%{_appdir}/engine/tools
+install engine/backup/vhcs2-bk-task $RPM_BUILD_ROOT%{_appdir}/engine/backup
+install engine/backup/vhcs2-backup-all $RPM_BUILD_ROOT%{_appdir}/engine/tools
 # Quota script:
-install engine/quota/vhcs2-dsk-quota $RPM_BUILD_ROOT/%{_appdir}/engine/quota
+install engine/quota/vhcs2-dsk-quota $RPM_BUILD_ROOT%{_appdir}/engine/quota
 
-install engine/traffic/*traff{,-SUSE} $RPM_BUILD_ROOT/%{_appdir}/engine/traffic
+install engine/traffic/*traff{,-SUSE} $RPM_BUILD_ROOT%{_appdir}/engine/traffic
 
-install engine/messager/*-msgr $RPM_BUILD_ROOT/%{_appdir}/engine/messager
+install engine/messager/*-msgr $RPM_BUILD_ROOT%{_appdir}/engine/messager
 
 # Setup and administration tools:
-install engine/setup/{*.sh,*setup} $RPM_BUILD_ROOT/%{_appdir}/engine/setup
-install engine/tools/vhcs2-httpd-logs-mngr $RPM_BUILD_ROOT/%{_appdir}/engine/tools
+install engine/setup/{*.sh,*setup} $RPM_BUILD_ROOT%{_appdir}/engine/setup
+install engine/tools/vhcs2-httpd-logs-mngr $RPM_BUILD_ROOT%{_appdir}/engine/tools
 
 ###############
 ## GUI:
-install gui/*.php $RPM_BUILD_ROOT/%{_appdir}/gui
-cp -dR gui/{admin,reseller,client,include} $RPM_BUILD_ROOT/%{_appdir}/gui
-rm -f $RPM_BUILD_ROOT/%{_appdir}/gui/{admin,reseller,client,include}/Makefile
-cp -dR gui/{domain_default_page,errordocs,images,themes,tools,orderpanel} $RPM_BUILD_ROOT/%{_appdir}/gui
+install gui/*.php $RPM_BUILD_ROOT%{_appdir}/gui
+cp -dR gui/{admin,reseller,client,include} $RPM_BUILD_ROOT%{_appdir}/gui
+rm -f $RPM_BUILD_ROOT%{_appdir}/gui/{admin,reseller,client,include}/Makefile
+cp -dR gui/{domain_default_page,errordocs,images,themes,tools,orderpanel} $RPM_BUILD_ROOT%{_appdir}/gui
 
 #%{__make} install \
 #	CC="%{__cc}" \
@@ -174,7 +174,7 @@
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 #%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.php
 %attr(755,root,root) %{_sbindir}/*
-%attr(751,root,root) /etc/init.d/*
+%attr(754,root,root) /etc/rc.d/init.d/*
 %dir %{_appdir}
 %dir %{_appdir}/engine
 %attr(750,root,http) %{_appdir}/engine/vhcs2*
@@ -270,6 +270,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.8  2006/07/25 14:50:11  blues
 - files are packaged - now the question is if it works...
 

================================================================
Index: SPECS/vtk.spec
diff -u SPECS/vtk.spec:1.8 SPECS/vtk.spec:1.9
--- SPECS/vtk.spec:1.8	Sun Oct 31 15:31:20 2004
+++ SPECS/vtk.spec	Wed Jul 26 17:56:36 2006
@@ -309,14 +309,14 @@
 %endif
 
 #install data
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-data
-cp -r VTKData-release-4-2/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-data
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-data
+cp -r VTKData-release-4-2/* $RPM_BUILD_ROOT%{_datadir}/%{name}-data
 rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}-data/CVS
 
 #install test-suite and examples
 for d in Common Filtering Graphics Hybrid IO Imaging Parallel Patented Rendering
 do
-	mkdir -p $RPM_BUILD_ROOT%{_datadir}/vtk-examples/Testing/$d
+	install -d $RPM_BUILD_ROOT%{_datadir}/vtk-examples/Testing/$d
 	cp -a $d/Testing/* $RPM_BUILD_ROOT%{_datadir}/vtk-examples/Testing/$d
 done
 cp -a Examples $RPM_BUILD_ROOT%{_datadir}/vtk-examples
@@ -439,6 +439,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.8  2004/10/31 14:31:20  paladine
 - spaces->tabs
 - formatting

================================================================
Index: SPECS/webCDwriter.spec
diff -u SPECS/webCDwriter.spec:1.43 SPECS/webCDwriter.spec:1.44
--- SPECS/webCDwriter.spec:1.43	Sun Nov 20 23:22:48 2005
+++ SPECS/webCDwriter.spec	Wed Jul 26 17:56:36 2006
@@ -18,15 +18,15 @@
 Patch0:		%{name}-FHS.patch
 # Source0Download: http://joerghaeger.de/webCDwriter/TARs.html
 URL:		http://JoergHaeger.de/webCDwriter/
-
-BuildRequires:	rpmbuild(macros) >= 1.202
-BuildRequires:	pam-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	binutils
-BuildRequires:	libstdc++-devel
 BuildRequires:	jdkgcj
-
+BuildRequires:	libstdc++-devel
+BuildRequires:	pam-devel
+BuildRequires:	rpmbuild(macros) >= 1.202
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/chown
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/find
@@ -34,14 +34,11 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/usermod
-Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/userdel
-Requires(postun):	/usr/sbin/groupdel
+Requires:	/usr/bin/isoinfo
+Requires:	/usr/bin/mkisofs
+Requires:	/usr/bin/readcd
 Requires:	cdrdao
 Requires:	cdrtools >= 2.01
-Requires:	/usr/bin/readcd
-Requires:	/usr/bin/mkisofs
-Requires:	/usr/bin/isoinfo
 Requires:	mpg123
 Requires:	sox
 Provides:	group(%{CDWgroup})
@@ -108,7 +105,7 @@
 
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_datadir}/CDWserver}
 mv $RPM_BUILD_ROOT/etc/init.d/CDWserver $RPM_BUILD_ROOT/etc/rc.d/init.d/CDWserver
-rm $RPM_BUILD_ROOT/%{_bindir}/CDWuninstall.sh
+rm $RPM_BUILD_ROOT%{_bindir}/CDWuninstall.sh
 
 %clean
 if [ ! -e $RPM_BUILD_ROOT/dev/ ]; then
@@ -275,6 +272,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.43  2005/11/20 22:22:48  wolvverine
 - release 1
 - STBR

================================================================
Index: SPECS/wxMaxima.spec
diff -u SPECS/wxMaxima.spec:1.2 SPECS/wxMaxima.spec:1.3
--- SPECS/wxMaxima.spec:1.2	Tue Feb 21 12:46:58 2006
+++ SPECS/wxMaxima.spec	Wed Jul 26 17:56:36 2006
@@ -40,7 +40,7 @@
 install -D wxmaxima.desktop $RPM_BUILD_ROOT%{_desktopdir}/wxmaxima.desktop
 sed -e "s at Application;Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;@Science;Math;@g" -i $RPM_BUILD_ROOT%{_desktopdir}/wxmaxima.desktop
 
-install -D maxima-new.png $RPM_BUILD_ROOT/%{_pixmapsdir}/maxima-new.png
+install -D maxima-new.png $RPM_BUILD_ROOT%{_pixmapsdir}/maxima-new.png
 %find_lang %{name}
 
 %clean
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.2  2006/02/21 11:46:58  piti
 - added --with-wx-config option to configure script
 

================================================================
Index: SPECS/xchat-gnome.spec
diff -u SPECS/xchat-gnome.spec:1.15 SPECS/xchat-gnome.spec:1.16
--- SPECS/xchat-gnome.spec:1.15	Wed Mar  1 03:58:21 2006
+++ SPECS/xchat-gnome.spec	Wed Jul 26 17:56:36 2006
@@ -6,19 +6,19 @@
 Name:		xchat-gnome
 Version:	0.10
 Release:	1
-Group:		X11/Applications/Networking
 License:	GPL
-Source0:	http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
+Group:		X11/Applications/Networking
+Source0:	http://flapjack.navi.cx/releases/xchat-gnome/%{name}-%{version}.tar.bz2
 # Source0-md5:	1ff2b7adfc71592951ee843599a8c8f7
-Patch0:	%{name}-long-delimiter.patch
+Patch0:		%{name}-long-delimiter.patch
 URL:		http://xchat.org/
+BuildRequires:	enchant-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2.0.0
-BuildRequires:	enchant-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	libsexy-devel
-BuildRequires:	python-devel
 BuildRequires:	perl-devel
+BuildRequires:	python-devel
 Requires(post):	GConf2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,8 +79,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT/%{_libdir}/xchat-gnome/plugins/*.a
-rm $RPM_BUILD_ROOT/%{_libdir}/xchat-gnome/plugins/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/xchat-gnome/plugins/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/xchat-gnome/plugins/*.la
 
 %find_lang xchat-gnome --with-gnome
 
@@ -124,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.15  2006/03/01 02:58:21  aredridel
 - up to 0.10
 

================================================================
Index: SPECS/xemacs-auctex-pkg.spec
diff -u SPECS/xemacs-auctex-pkg.spec:1.42 SPECS/xemacs-auctex-pkg.spec:1.43
--- SPECS/xemacs-auctex-pkg.spec:1.42	Wed Jul 19 10:37:37 2006
+++ SPECS/xemacs-auctex-pkg.spec	Wed Jul 26 17:56:36 2006
@@ -107,7 +107,7 @@
 # movig info and dvi files that are installed not in the proper place
 install -d $RPM_BUILD_ROOT%{_infodir}
 install -d $RPM_BUILD_ROOT%{_datadir}/texmf/doc/latex/preview
-mv $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/info/* $RPM_BUILD_ROOT/%{_infodir}
+mv $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/info/* $RPM_BUILD_ROOT%{_infodir}
 mv $RPM_BUILD_ROOT%{_datadir}/texmf/doc/latex/styles/preview.dvi $RPM_BUILD_ROOT%{_datadir}/texmf/doc/latex/preview
 # remove .el file if corresponding .elc file exists
 find $RPM_BUILD_ROOT -type f -name "*.el" | while read i; do test ! -f ${i}c || rm -f $i; done
@@ -152,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/07/26 15:56:36  glen
+- remove extra unneeded slash
+
 Revision 1.42  2006/07/19 08:37:37  piti
 - up to 11.83
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/syslinux.spec?r1=1.68&r2=1.69&f=u
    http://cvs.pld-linux.org/SPECS/tinyerp-server.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/ulogd.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/vhcs2.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/vtk.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/webCDwriter.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SPECS/wxMaxima.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/xchat-gnome.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/xemacs-auctex-pkg.spec?r1=1.42&r2=1.43&f=u

More information about the pld-cvs-commit mailing list