Author: glen Date: Sun Apr 16 21:53:58 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix chkconfig, rc-scripts deps
---- Files affected:
SPECS:
hula.spec (1.5 -> 1.6) , ipsec-tools.spec (1.46 -> 1.47) , iscsitarget.spec
(1.13 -> 1.14) , ism.spec (1.8 -> 1.9) , job.spec (1.2 -> 1.3) ,
libchipcard.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/hula.spec
diff -u SPECS/hula.spec:1.5 SPECS/hula.spec:1.6
--- SPECS/hula.spec:1.5 Sat Mar 18 22:27:47 2006
+++ SPECS/hula.spec Sun Apr 16 23:53:53 2006
@@ -18,9 +18,11 @@
BuildRequires: openssl-devel
BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,postun): /sbin/ldconfig
+Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
+Requires: rc-scripts
Provides: user(hula)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,7 +74,7 @@
$RPM_BUILD_ROOT%{_libdir}/modweb/*.la
# remove empty or irrelevant doco
-rm -f $RPM_BUILD_ROOT/{ChangeLog,INSTALL,NEWS}
+rm $RPM_BUILD_ROOT/{ChangeLog,INSTALL,NEWS}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -87,7 +89,7 @@
/sbin/chkconfig --add hula
%preun
-if [ "$1" -eq 0 ]; then
+if [ "$1" = 0 ]; then
%service hula stop
/sbin/chkconfig --del hula
fi
@@ -394,6 +396,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2006/04/16 21:53:53 glen
+- fix chkconfig, rc-scripts deps
+
Revision 1.5 2006/03/18 21:27:47 qboosh
- pl
================================================================
Index: SPECS/ipsec-tools.spec
diff -u SPECS/ipsec-tools.spec:1.46 SPECS/ipsec-tools.spec:1.47
--- SPECS/ipsec-tools.spec:1.46 Tue Feb 7 13:19:50 2006
+++ SPECS/ipsec-tools.spec Sun Apr 16 23:53:53 2006
@@ -28,7 +28,9 @@
BuildRequires: openssl-devel >= 0.9.7d
%{?with_radius:BuildRequires: radius}
BuildRequires: sed >= 4.0
+Requires(post,preun): /sbin/chkconfig
Requires: libipsec = %{version}-%{release}
+Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -96,7 +98,7 @@
%configure \
%{?with_kerberos5:--enable-gssapi} \
%{?with_radius:--with-libradius} \
- --with-kernel-headers=/usr/include \
+ --with-kernel-headers=%{_includedir} \
--enable-dpd \
--enable-frag \
--enable-hybrid \
@@ -119,7 +121,7 @@
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/racoon
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/racoon
-install src/racoon/samples/*.txt src/racoon/samples/*.conf
$RPM_BUILD_ROOT/etc/racoon
+install src/racoon/samples/*.txt src/racoon/samples/*.conf
$RPM_BUILD_ROOT%{_sysconfdir}/racoon
%clean
rm -rf $RPM_BUILD_ROOT
@@ -152,7 +154,7 @@
%attr(600,root,root) %{_sysconfdir}/racoon/*.txt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/racoon/*.txt
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/racoon/*.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/racoon
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/racoon
%{_mandir}/man[58]/*
%files -n libipsec
@@ -181,6 +183,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2006/04/16 21:53:53 glen
+- fix chkconfig, rc-scripts deps
+
Revision 1.46 2006/02/07 12:19:50 zawadaa
- cleanups, yes satype-revert.patch is outdated ;-)
- STBR - it works on production
================================================================
Index: SPECS/iscsitarget.spec
diff -u SPECS/iscsitarget.spec:1.13 SPECS/iscsitarget.spec:1.14
--- SPECS/iscsitarget.spec:1.13 Wed Apr 12 14:15:41 2006
+++ SPECS/iscsitarget.spec Sun Apr 16 23:53:53 2006
@@ -27,6 +27,8 @@
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.0}
%endif
+Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -167,7 +169,7 @@
# if [ -f /var/lock/subsys/targetiscsi ]; then
# /etc/rc.d/init.d/targetiscsi stop >&2
# fi
- /sbin/chkconfig --del targetiscsi
+ /sbin/chkconfig --del targetiscsi
fi
%if %{with userspace}
@@ -199,6 +201,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2006/04/16 21:53:53 glen
+- fix chkconfig, rc-scripts deps
+
Revision 1.13 2006/04/12 12:15:41 glen
- add kernel epoch, adapterized
================================================================
Index: SPECS/ism.spec
diff -u SPECS/ism.spec:1.8 SPECS/ism.spec:1.9
--- SPECS/ism.spec:1.8 Sun Apr 10 16:01:10 2005
+++ SPECS/ism.spec Sun Apr 16 23:53:53 2006
@@ -8,45 +8,45 @@
License: restricted, non-distributable
Group: Applications/System
# downloading from
http://downloadfinder.intel.com/scripts-df/Product_Filter.asp?ProductID=1071
-Source0: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)aa
+Source0: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)aa
# NoSource0-md5: 52ea53ae2cf93247ca07c0cf257367b6
NoSource: 0
-Source1: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ab
+Source1: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ab
# NoSource1-md5: 9bca501dba89dd7720913124c3ade71a
NoSource: 1
-Source2: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ac
+Source2: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ac
# NoSource2-md5: f1e8e2b09568f87e65d2371a5899c688
NoSource: 2
-Source3: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ad
+Source3: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ad
# NoSource3-md5: 76950c98eb18b0c1aaf00335088eaa12
NoSource: 3
-Source4: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ae
+Source4: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ae
# NoSource4-md5: 26e3e232228b19c0c73ad62ba76bcd9b
NoSource: 4
-Source5: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)af
+Source5: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)af
# NoSource5-md5: 654e183a32c59a4a47f9c457cfc5643d
NoSource: 5
-Source6: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ag
+Source6: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ag
# NoSource6-md5: 783e1dd01f73b23109e87e9970434b58
NoSource: 6
-Source7: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ah
+Source7: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ah
# NoSource7-md5: 55510bc5c5b3166dc14915e91ecd5ad8
NoSource: 7
-Source8: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ai
+Source8: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ai
# NoSource8-md5: d18d195baec683b3aa565191907d6a20
NoSource: 8
-Source9: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)aj
+Source9: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)aj
# NoSource9-md5: 4233b377ea46a37f06d3fa7222cd2188
NoSource: 9
-Source10: http://aiedownload.intel.com/df-support/8590/eng/ism%(echo
%{version} | tr -d .)ak
+Source10: http://aiedownload.intel.com/df-support/8590/eng/%{name}%(echo
%{version} | tr -d .)ak
# NoSource10-md5: 2d426246767550ee4eeae06fac1bd9f5
NoSource: 10
Source101: %{name}-cli.init
Source102: dpcproxy.sysconfig
+BuildRequires: cdrtools-utils
+BuildRequires: mawk
BuildRequires: rpm-utils
BuildRequires: unzip
-BuildRequires: mawk
-BuildRequires: cdrtools-utils
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,6 +60,8 @@
Summary: Serial Over Lan service
Summary(pl): Usługa Serial over LAN
Group: Applications/System
+Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
%description cli
Command Line Interface (CLI) provides the interface to the Serial Over
@@ -139,6 +141,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2006/04/16 21:53:53 glen
+- fix chkconfig, rc-scripts deps
+
Revision 1.8 2005/04/10 14:01:10 glen
- ism 8.3.0
================================================================
Index: SPECS/job.spec
diff -u SPECS/job.spec:1.2 SPECS/job.spec:1.3
--- SPECS/job.spec:1.2 Sat Jun 25 23:38:49 2005
+++ SPECS/job.spec Sun Apr 16 23:53:53 2006
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO
+# - optflags
Summary: Linux Jobs
Summary(pl): Narzędzia do obsługi zadań pod Linuksem
Name: job
@@ -9,6 +11,8 @@
Source0:
ftp://oss.sgi.com/projects/pagg/download/%{name}-%{version}.tar.gz
# Source0-md5: 4cc7c983765c934e33d4078bf530a978
URL: http://oss.sgi.com/projects/pagg/
+Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -89,7 +93,7 @@
echo ""
echo " account optional /lib/security/pam_job.so"
echo ""
-echo "Consult the /usr/share/doc/job-1.4/README file for additional"
+echo "Consult the %{_docdir}/job-1.4/README file for additional"
echo "information about the PAM module."
echo ""
exit 0
@@ -100,6 +104,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2006/04/16 21:53:53 glen
+- fix chkconfig, rc-scripts deps
+
Revision 1.2 2005/06/25 21:38:49 qboosh
- pl, some cleanups
================================================================
Index: SPECS/libchipcard.spec
diff -u SPECS/libchipcard.spec:1.7 SPECS/libchipcard.spec:1.8
--- SPECS/libchipcard.spec:1.7 Tue Dec 13 12:54:17 2005
+++ SPECS/libchipcard.spec Sun Apr 16 23:53:53 2006
@@ -1,4 +1,7 @@
# $Revision$, $Date$
+# TODO
+# - choose one Summary(pl) for -tools
+#
# Conditional build:
%bcond_without static_libs # don't build static library
#
@@ -63,11 +66,13 @@
%package tools
Summary: Terminal tools and daemons for LibChipCard
-Summary(pl): Narzędzia terminalowe i demony dla LibChipCard
Summary(pl): Demon ChipCard i zwią
+Summary(pl): Narzędzia terminalowe i demony dla LibChipCard
License: GPL
Group: Applications
+Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}
+Requires: rc-scripts
%description tools
This package contains the terminal tools and daemons for LibChipCard.
@@ -196,6 +201,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2006/04/16 21:53:53 glen
+- fix chkconfig, rc-scripts deps
+
Revision 1.7 2005/12/13 11:54:17 glen
- adalterized (sorted %verify flags)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/hula.spec?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SPECS/ipsec-tools.spec?r1=1.46&r2=1.47&f=u
http://cvs.pld-linux.org/SPECS/iscsitarget.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/ism.spec?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SPECS/job.spec?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SPECS/libchipcard.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
