SPECS: capi4k-utils.spec, courier.spec, dcc-dccd.spec, fedora-ds-admin.spec...

baggins baggins at pld-linux.org
Sun Mar 22 23:33:57 CET 2009 

Author: baggins                      Date: Sun Mar 22 22:33:57 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified: removed _initrddir macro usage

---- Files affected:
SPECS:
   capi4k-utils.spec (1.21 -> 1.22) , courier.spec (1.161 -> 1.162) , dcc-dccd.spec (1.30 -> 1.31) , fedora-ds-admin.spec (1.1 -> 1.2) , fedora-ds-base.spec (1.1 -> 1.2) , freeipmi.spec (1.11 -> 1.12) , freenet6-client.spec (1.13 -> 1.14) , gnustep-base.spec (1.89 -> 1.90) , htb.init.spec (1.21 -> 1.22) , iptables.spec (1.259 -> 1.260) , irrd.spec (1.20 -> 1.21) , ivman.spec (1.16 -> 1.17) , kolab.spec (1.10 -> 1.11) , livecd-installed.spec (1.8 -> 1.9) , livecd.spec (1.21 -> 1.22) , natmonitor.spec (1.34 -> 1.35) , netatalk.spec (1.67 -> 1.68) , netplug.spec (1.21 -> 1.22) , niceshaper.spec (1.31 -> 1.32) , openmosix-tools.spec (1.27 -> 1.28) , pgpool.spec (1.13 -> 1.14) , shaperd.2.spec (1.38 -> 1.39) , soundmodem.spec (1.10 -> 1.11) , spamass-milter.spec (1.6 -> 1.7) , webfs.spec (1.12 -> 1.13) , zenoss.spec (1.4 -> 1.5) , zoneminder.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: SPECS/capi4k-utils.spec
diff -u SPECS/capi4k-utils.spec:1.21 SPECS/capi4k-utils.spec:1.22
--- SPECS/capi4k-utils.spec:1.21	Wed Mar 19 17:39:11 2008
+++ SPECS/capi4k-utils.spec	Sun Mar 22 23:33:44 2009
@@ -187,7 +187,7 @@
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/capi
 
 # install capi startup script
-install -D %{SOURCE11} $RPM_BUILD_ROOT%{_initrddir}/capi
+install -D %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/capi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -212,7 +212,7 @@
 %attr(755,root,root) %{_sbindir}/capiinit
 %attr(755,root,root) %{_sbindir}/avmcapictrl
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(754,root,root) %{_initrddir}/capi
+%attr(754,root,root) /etc/rc.d/init.d/capi
 %{_mandir}/man8/capiinfo.8*
 %{_mandir}/man8/avmcapictrl.8*
 %dir %{_datadir}/isdn
@@ -254,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2009/03/22 22:33:44  baggins
+- unified: removed _initrddir macro usage
+
 Revision 1.21  2008/03/19 16:39:11  hawk
 - release 2
 

================================================================
Index: SPECS/courier.spec
diff -u SPECS/courier.spec:1.161 SPECS/courier.spec:1.162
--- SPECS/courier.spec:1.161	Sun Mar 15 18:43:11 2009
+++ SPECS/courier.spec	Sun Mar 22 23:33:44 2009
@@ -65,7 +65,6 @@
 %define		_localstatedir	/var/spool/courier
 %define		_sysconfdir	/etc/courier
 %define		_certsdir	%{_sysconfdir}/certs
-%define		_initrddir	/etc/rc.d/init.d
 
 %define		_webapps	/etc/webapps
 %define		_cgibindir	%{_prefix}/lib/cgi-bin
@@ -321,7 +320,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 umask 022
-install -d -p $RPM_BUILD_ROOT{/etc/{cron.hourly,pam.d},%{_initrddir}} \
+install -d -p $RPM_BUILD_ROOT/etc/{cron.hourly,pam.d,rc.d/init.d} \
 	$RPM_BUILD_ROOT{%{_prefix}/lib,%{_cgibindir},%{_webapps}/courier-webmail,%{_sysconfdir}/hosteddomains} \
 	$RPM_BUILD_ROOT{/etc/cron.hourly,%{_certsdir}}
 
@@ -413,7 +412,7 @@
 # create calendarmode
 touch $RPM_BUILD_ROOT%{_sysconfdir}/calendarmode
 
-install courier.sysvinit $RPM_BUILD_ROOT%{_initrddir}/courier
+install courier.sysvinit $RPM_BUILD_ROOT/etc/rc.d/init.d/courier
 
 # sendmail soft links
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_prefix}/lib/sendmail
@@ -907,6 +906,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2009/03/22 22:33:44  baggins
+- unified: removed _initrddir macro usage
+
 Revision 1.161  2009/03/15 17:43:11  hawk
 - blah, release 2
 
@@ -1070,427 +1072,3 @@
 Revision 1.113  2005/08/16 23:26:33  andree
 - updated to 0.51.0
 - added script rm -static
-
-Revision 1.112  2005/07/03 22:45:02  andree
-- updated to 0.50.1
-
-Revision 1.111  2005/04/09 22:50:48  andree
-- rel. 1
-
-Revision 1.110  2005/03/24 23:41:21  qboosh
-- added db patch to use shared db
-- adjusted automake calls not to require ltmain.sh symlinking hacks
-
-Revision 1.109  2005/03/24 22:42:58  qboosh
-- tab unified
-
-Revision 1.108  2005/03/24 15:27:22  havner
-- requires db-static, don't know if it's meant to be that way
-
-Revision 1.107  2005/03/21 17:46:55  glen
-- tabs; _initrddir macro
-
-Revision 1.106  2005/03/05 18:30:55  andree
-- merged from DEVEL
-
-Revision 1.105  2005/02/28 21:53:19  qboosh
-- s/aleron\.dl/dl/ in Source URL (aleron is no longer browsable)
-
-Revision 1.104  2005/02/12 19:50:02  arekm
-- rel ++
-
-Revision 1.103  2004/12/24 00:04:41  andree
-- fam support enabled by default, rel.4
-
-Revision 1.102.2.9  2005/03/05 11:41:23  glen
-- quotes
-
-Revision 1.102.2.8  2005/03/05 11:38:17  andree
-- fixed apache1,2 support
-
-Revision 1.102.2.7  2005/03/05 00:01:42  andree
-- updated to 0.49.0, removed -build.patch (obsoleted)
-- added post, preun section for webmail (apache1,2 support)
-- %files fixes
-- R(post): courier-authlib-userdb - to allow upgrade from < 0.47
-  and removed obsolete trigger
-- removed suid from webmail
-
-Revision 1.102.2.6  2005/02/19 14:35:04  andree
-- enable fam by default
-- added trigger with information about userdb
-- removed userdb dead links and unused directory
-- rel. 0.2
-
-Revision 1.102.2.5  2004/12/15 11:32:18  andree
-- updated to 0.48
-
-Revision 1.102.2.4  2004/12/15 10:46:59  andree
-- %files fixes
-- removed courier-smtpauth, added obsolete
-
-Revision 1.102.2.3  2004/12/11 00:43:16  andree
-- %files fixes
-- added some configure options (mailuser,group,uid,gid)
-
-Revision 1.102.2.2  2004/12/10 11:49:10  andree
-- added -build.patch - build fixes (linking, configure)
-
-Revision 1.102.2.1  2004/12/10 00:29:11  andree
-- updated to 20041129
-- removed auth* packages - included in courier-authlib
-- needs a lot of work - added TODO
-
-Revision 1.102  2004/11/20 17:25:37  radek
-- release 3: require DynaLoader in version available at build time
-  (for /usr/lib/courier/filters/perlfilter)
-
-Revision 1.101  2004/10/06 19:13:35  andree
-- rel. 2 to rebuild with updated -sendmail_dir.patch
-
-Revision 1.100  2004/09/22 20:46:23  andree
-- updated to 0.47
-
-Revision 1.99  2004/08/30 18:07:23  snurf
-- typo / formatting / etc.
-
-Revision 1.98  2004/08/02 17:15:49  andree
-- change source to aleron.dl.sourceforge.net
-- remove fix_build.patch - obsoleted
-- BR: sed >= 4.0 ; sed fixes
-- updated to 0.46
-
-Revision 1.97  2004/07/27 23:09:47  andree
-- add bofh config file with badmime option
-- perm fixes; updated %post smtpauth
-- fix csh script; rel. 4
-
-Revision 1.96  2004/07/24 19:43:14  andree
-- rel. 3
-
-Revision 1.95  2004/07/23 11:55:10  andree
-- added missing files
-
-Revision 1.94  2004/07/21 14:33:58  andree
-- amd64 fix (mkdir /usr/lib for sendmail)
-
-Revision 1.93  2004/07/21 14:06:34  averne
-- rel 2
-
-Revision 1.92  2004/07/14 07:33:25  andree
-- cleanups; perm fixes; added missing dir
-
-Revision 1.91  2004/06/15 16:34:24  andree
-- updated to 0.45.6
-
-Revision 1.90  2004/06/07 09:02:12  ankry
-- formatting
-
-Revision 1.89  2004/06/07 08:32:55  andree
-- fix %post (imapd,pop3d) scripts; rel. 2
-
-Revision 1.88  2004/05/30 22:21:16  andree
-- update post,preun; fix certsdir perm; rel.1
-
-Revision 1.87  2004/05/28 11:58:43  andree
-- update post,pre for webmail, rel. 0.7
-
-Revision 1.86  2004/05/28 10:59:00  andree
-- add new files, rel. 0.6
-
-Revision 1.85  2004/05/24 22:14:40  andree
-- add courier-certs.patch (--with-certsdir option)
-- move certs to %certsdir; trigger for new certs directory
-- remove authmodulelist; rel 0.5
-
-Revision 1.84  2004/05/20 16:20:13  andree
-- started update to 0.45.5
-
-Revision 1.83  2004/04/17 16:49:33  andree
-- perm fixes
-
-Revision 1.82  2004/04/17 11:05:25  andree
-- add file calendarmode, put info to  %post webmail
-
-Revision 1.81  2004/04/17 10:41:22  andree
-- updated %doc, added missing dirs
-- sharedindex* move back to primary package
-
-Revision 1.80  2004/04/10 21:34:56  andree
-- add patch5 - am fix
-
-Revision 1.79  2004/04/10 20:09:29  andree
-- updated to 0.45.4
-
-Revision 1.78  2004/04/07 09:56:11  andree
-- don't put localhost to localdomains
-
-Revision 1.77  2004/04/05 10:34:24  andree
-- packet maildir -> maildir-tools
-- put localdomain to /etc/courier/me, obsoletes postfix
-- rel.1 ready to go
-
-Revision 1.76  2004/04/04 10:39:04  andree
-- %doc fixes
-
-Revision 1.75  2004/04/03 20:30:22  andree
-- maildir tools goes to separate package
-
-Revision 1.74  2004/04/03 19:16:24  andree
-- package INSTALL to doc (lot of configuration tips)
-- webadmin goes to separate package
-- %files fixes
-- rel 0.9 working in progress
-
-Revision 1.73  2004/04/02 00:38:08  andree
-- updated to 0.45.3
-
-Revision 1.72  2004/03/29 10:40:13  andree
-- esmtpacceptmailfor change to default
-- openssl-tools >= 0.9.7d
-
-Revision 1.71  2004/03/19 23:46:23  ankry
-- massive change: BR openssl-devel >= 0.9.7d
-
-Revision 1.70  2004/03/17 23:25:46  andree
-- more post,preun fixes; rel. 1
-
-Revision 1.69  2004/03/17 18:28:37  andree
-- updated to 0.45.2
-- removed no_res_query patch (seems to be fixed)
-
-Revision 1.68  2004/03/17 17:51:08  andree
-- fix rmail link
-
-Revision 1.67  2004/03/17 10:16:24  andree
-- files fixes, updated docs
-- fix post,preun auth*
-
-Revision 1.66  2004/03/16 21:37:03  andree
-- updated to 0.45.1, rel 0.9
-
-Revision 1.65  2004/03/16 14:20:09  averne
-- rel7 for rebuild with new openldap
-
-Revision 1.64  2004/03/02 17:35:48  andree
-- fix stop/start scripts (patch5)
-- fix post,preun, rel. 6
-
-Revision 1.63  2004/02/26 17:24:30  qboosh
-- fixed missing defattrs
-
-Revision 1.62  2004/02/26 17:19:23  andree
-- updated docs, rel. 5
-
-Revision 1.61  2004/02/25 21:49:02  ankry
-- cosmetics
-
-Revision 1.60  2004/02/25 21:42:27  blues
-- obsoletes nullmailer and ssmtp
-
-Revision 1.59  2004/02/25 15:36:37  andree
-- change sendmail dir to sbindir (patch4)
-- install missing dir /usr/lib on amd64
-
-Revision 1.58  2004/02/25 14:07:13  qboosh
-- fixed deps (thx andree)
-
-Revision 1.57  2004/02/24 20:52:37  blues
-- mail daemon obsoletes other daemons
-
-Revision 1.56  2004/02/24 17:14:28  andree
-- fix attr for sendmail
-- ac,am in courier dir (res_query), rel. 4
-
-Revision 1.55  2004/02/23 18:42:24  qboosh
-- no paths to pam_unix.so (not needed, only broke lib64)
-- /usr/lib/sendmail compat symlink is constant, should not depend on any macros
-- strict internal deps
-
-Revision 1.54  2004/02/23 17:06:23  andree
-- don't check for res_query - never used (patch3)
-- new directory structure (use default prefix)
-- cp config.sub to webmail, rel. 3
-
-Revision 1.53  2004/02/21 13:29:50  andree
-- fixes in files, pre, post
-
-Revision 1.52  2004/02/20 15:40:38  andree
-- back to /home/services
-- remove Mail/Maildir from skel
-- webmail starting, restarting (post, preun)
-
-Revision 1.51  2004/02/17 23:30:07  andree
-- Maildir -> Mail/Maildir (patch2)
-- pam.d/* back to config(noreplace)...
-- Requires(post): openssl-tools (to generate certificates)
-
-Revision 1.50  2004/02/17 00:30:11  andree
-- BR: postgresql-devel
-- make new pam.d/* files (no longer need pam_stack.so)
-- added locals, esmtpacceptmailfor
-- added Maildir folder to /etc/skel/
-- added info how to configure in post
-
-Revision 1.49  2004/02/10 00:40:46  ankry
-- spaces -> tabs, pl fixes
-
-Revision 1.48  2004/02/10 00:02:29  andree
-- added 3 packages - authdaemons (ldap, pgsql, myqsl)
-- change default esmtpd to _on_ ; added TODO
-
-Revision 1.47  2004/02/04 15:39:24  averne
-- /home/services -> /srv
-- rel 2
-
-Revision 1.46  2003/12/15 12:13:58  andree
-- added patch1 build without fam support (bcond with fam)
-
-Revision 1.45  2003/12/15 02:17:59  andree
-- don't build fax files
-- added missing dirs, files, move webgpg to webmail package
-- remove unpackaged files, package some unpackaged files (pcpd)
-
-Revision 1.44  2003/12/11 12:41:18  qboosh
-- use config(noreplace)
-
-Revision 1.43  2003/12/11 12:33:09  andree
-- mv pop3d-ssl to pop3d package
-- add script to create config files
-- change /etc/courier/*.dist to /etc/courier/* in files section
-
-Revision 1.42  2003/12/09 11:42:21  andree
-- remove without_test bcond (in latest ac build ok)
-- small fixes in webmail files section
-- release 1
-
-Revision 1.41  2003/11/30 15:22:09  adamg
-- updated to 0.44.2
-- new bcond (without_tests), that skips "make check" in %build
-
-Revision 1.40  2003/11/18 12:36:40  andree
-- fix mistake (change authlib.1 to authlib.7 in links)
-
-Revision 1.39  2003/11/18 11:53:18  andree
-- make better man links (suggested by qboosh)
-
-Revision 1.38  2003/11/18 00:48:54  andree
-- updated to 0.44.0 (few changed file names, added maildirkw, manpages)
-- added missing esmtpd-ssl and link
-- make links to man pages in post, preun
-- TODO: fix build with make check (without it, it build ok)
-
-Revision 1.37  2003/09/30 20:18:20  eothane
-- ahh, what the hell: openssl 0.9.7c
-
-Revision 1.36  2003/08/18 08:07:58  gotar
-- mass commit: cosmetics (removed trailing white spaces)
-
-Revision 1.35  2003/08/06 16:49:58  kloczek
-- może wrescie ktoś wykasuje to konto ?
-
-Revision 1.34  2003/07/07 04:23:52  blues
-- many small fixes, inspired by kloczek
-
-Revision 1.33  2003/05/26 16:24:49  malekith
-- massive attack: adding Source-md5
-
-Revision 1.32  2003/05/25 05:46:23  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.31  2003/04/08 09:52:14  qboosh
-- working Source0 URL
-
-Revision 1.30  2003/03/31 10:50:55  qboosh
-- no subshell, BR: am,lt
-
-Revision 1.29  2003/03/30 22:12:46  qwark
-- new version 0.42.0; change in BR;change from configure2_13 to configure; still need some work to compile under NEST (db3->db4.1);undar ra compilation is OK
-
-Revision 1.28  2003/03/02 15:55:43  radek
-- BR: mailcap  (does not compile anyway ;-)
-
-Revision 1.27  2003/02/13 14:02:02  juandon
-- force to use openssl >= 0.9.7, idea by kloczek
-
-Revision 1.26  2003/01/19 22:18:39  qboosh
-- argh, fixed _mandir
-- more specific Requires()
-
-Revision 1.25  2003/01/18 22:45:27  juandon
-- removed two lines with define
-
-Revision 1.24  2002/12/07 19:09:42  orzech
-- /home -> /home/services
-
-Revision 1.23  2002/11/25 01:40:36  ankry
-- Massive attack:
-  - s/man[ea]d[zż][ae]r/zarządca/g
-  - (some) new %doc
-
-Revision 1.22  2002/10/10 12:51:50  marcus
-- use new %doc
-
-Revision 1.21  2002/05/16 23:44:38  marcus
-- fixed %install
-
-Revision 1.20  2002/05/14 07:56:04  ankry
-- changed groups to ones used by other functionally similar packages
-- BR: expect, openssl-tools
-- "install -d" fixes
-- NFY, release 1.1
-
-Revision 1.19  2002/05/07 14:22:43  kloczek
-- some cosmetics.
-
-Revision 1.18  2002/05/07 14:12:30  pioklo
-- update to 0.38 ,STBR
-- fix %files section
-
-Revision 1.17  2002/04/25 16:06:50  arturs
-- fixed a small typo
-
-Revision 1.16  2002/02/23 01:44:57  kloczek
-- adapterized.
-
-Revision 1.15  2002/02/22 23:28:45  kloczek
-- removed all Group fields translations (our rpm now can handle translating
-  Group field using gettext).
-
-Revision 1.14  2002/01/18 02:12:35  kloczek
-- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
-
-Revision 1.13  2002/01/09 12:25:35  qboosh
-- removed whole file lists generation, added lists to %files fixing many
-  ownership stupidities (NFY - need to check files with uid||gid daemon)
-- added more BuildRequires
-- TODO: proper daemons starting/restarting/stopping in post/preun, check
-  permissions etc.
-
-Revision 1.12  2002/01/03 12:15:19  qboosh
-- some BReqs, added patch to fix c_rehash searching
-
-Revision 1.11  2001/12/07 21:12:45  mkochano
-- /etc/pam.d/* marked with %config(noreplace).
-- Release++ (I'm too lazy to write here new release number for each
-  spec. Sorry).
-
-Revision 1.10  2001/11/07 10:41:31  qboosh
-- adapterized, added -q to %setup
-
-Revision 1.9  2001/10/03 02:32:55  marcus
-- new version 0.35.1
-
-Revision 1.8  2001/09/24 11:24:08  qboosh
-- Prereq: /sbin/chkconfig
-- cleanups, pl translations, added URLs
-- NOTE: %install and %files should be rewritten; current version is 0.35.1
-
-Revision 1.7  2001/08/23 16:51:10  filon
-- changed: make -> %{__make}
-
-Revision 1.6  2001/07/26 05:42:05  saq
-- reverting last change: removing new macros from %p{re,ost}{,un}
-
-Revision 1.4  2000/12/07 02:43:45  agaran
-- Another $Log fixing

================================================================
Index: SPECS/dcc-dccd.spec
diff -u SPECS/dcc-dccd.spec:1.30 SPECS/dcc-dccd.spec:1.31
--- SPECS/dcc-dccd.spec:1.30	Mon Feb 12 22:23:52 2007
+++ SPECS/dcc-dccd.spec	Sun Mar 22 23:33:44 2009
@@ -169,7 +169,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_initrddir}
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cron.daily,httpd}
 install -d $RPM_BUILD_ROOT/var/run/dcc
 install -d $RPM_BUILD_ROOT%{dccdir}/{log,userdirs/{local,esmtp,cyrus,procmail}}
@@ -196,7 +196,7 @@
 	MANDIR=$RPM_BUILD_ROOT%{_mandir}/man
 
 install misc/cron-dccd $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/dccd
-install misc/rcDCC $RPM_BUILD_ROOT%{_initrddir}/dccd
+install misc/rcDCC $RPM_BUILD_ROOT/etc/rc.d/init.d/dccd
 install homedir/flod $RPM_BUILD_ROOT%{dccdir}/flod
 
 # move some binaries in place, wierd stuff...
@@ -349,6 +349,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/03/22 22:33:44  baggins
+- unified: removed _initrddir macro usage
+
 Revision 1.30  2007/02/12 21:23:52  glen
 - tabs in preamble
 

================================================================
Index: SPECS/fedora-ds-admin.spec
diff -u SPECS/fedora-ds-admin.spec:1.1 SPECS/fedora-ds-admin.spec:1.2
--- SPECS/fedora-ds-admin.spec:1.1	Mon Jun  9 18:30:32 2008
+++ SPECS/fedora-ds-admin.spec	Sun Mar 22 23:33:44 2009
@@ -89,7 +89,7 @@
 %dir %{_sysconfdir}/%{pkgname}/admin-serv
 %config(noreplace)%{_sysconfdir}/%{pkgname}/admin-serv/*.conf
 %{_datadir}/%{pkgname}
-%{_initrddir}/%{pkgname}-admin
+/etc/rc.d/init.d/%{pkgname}-admin
 %config(noreplace)%verify(not md5 mtime size) /etc/sysconfig/%{pkgname}-admin
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/*.so.*
@@ -104,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/03/22 22:33:44  baggins
+- unified: removed _initrddir macro usage
+
 Revision 1.1  2008/06/09 16:30:32  adamg
 - new
 

================================================================
Index: SPECS/fedora-ds-base.spec
diff -u SPECS/fedora-ds-base.spec:1.1 SPECS/fedora-ds-base.spec:1.2
--- SPECS/fedora-ds-base.spec:1.1	Mon Jun  9 18:31:51 2008
+++ SPECS/fedora-ds-base.spec	Sun Mar 22 23:33:45 2009
@@ -123,7 +123,7 @@
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
 %config(noreplace)%verify(not md5 mtime size) /etc/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
-%{_initrddir}/%{pkgname}
+/etc/rc.d/init.d/%{pkgname}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libdir}/%{pkgname}
@@ -147,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/03/22 22:33:45  baggins
+- unified: removed _initrddir macro usage
+
 Revision 1.1  2008/06/09 16:31:51  adamg
 - new
 

================================================================
Index: SPECS/freeipmi.spec
diff -u SPECS/freeipmi.spec:1.11 SPECS/freeipmi.spec:1.12
--- SPECS/freeipmi.spec:1.11	Sat Jun 14 20:28:05 2008
+++ SPECS/freeipmi.spec	Sun Mar 22 23:33:45 2009
@@ -142,8 +142,8 @@
 
 %{__make} install -j1 \
 	DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_initrddir}
-mv $RPM_BUILD_ROOT/etc/init.d/freeipmi* $RPM_BUILD_ROOT%{_initrddir}
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+mv $RPM_BUILD_ROOT/etc/init.d/freeipmi* $RPM_BUILD_ROOT/etc/rc.d/init.d
 # TODO: patch Makefile.am instead
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/capi4k-utils.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/courier.spec?r1=1.161&r2=1.162&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dcc-dccd.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fedora-ds-admin.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fedora-ds-base.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freeipmi.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freenet6-client.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnustep-base.spec?r1=1.89&r2=1.90&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/htb.init.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iptables.spec?r1=1.259&r2=1.260&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/irrd.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ivman.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kolab.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/livecd-installed.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/livecd.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/natmonitor.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/netatalk.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/netplug.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/niceshaper.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openmosix-tools.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pgpool.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/shaperd.2.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/soundmodem.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/spamass-milter.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/webfs.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zenoss.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zoneminder.spec?r1=1.67&r2=1.68&f=u

More information about the pld-cvs-commit mailing list