rpms/fedora-ds-base/devel .cvsignore, 1.6, 1.7 fedora-ds-base-cvs.sh, 1.3, 1.4 fedora-ds-base-devel.README, 1.1, 1.2 fedora-ds-base.spec, 1.4, 1.5 sources, 1.6, 1.7

Mon Aug 13 15:48:44 UTC 2007

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5286/devel

Modified Files:
	.cvsignore fedora-ds-base-cvs.sh fedora-ds-base-devel.README 
	fedora-ds-base.spec sources 
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv.  It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7

--- .cvsignore	20 Jul 2007 21:55:33 -0000	1.6
+++ .cvsignore	13 Aug 2007 15:48:12 -0000	1.7
@@ -1,2 +1 @@
-fedora-ds-base-1.1.0-20070320.tar.bz2
-fedora-ds-base-1.1.0-20070720.tar.bz2
+fedora-ds-base-1.1.0.tar.bz2


Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base-cvs.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-base-cvs.sh	20 Jul 2007 21:55:33 -0000	1.3
+++ fedora-ds-base-cvs.sh	13 Aug 2007 15:48:12 -0000	1.4
@@ -1,13 +1,15 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr110a4
+CVSTAG=FedoraDirSvr110b1
 VERSION=1.1.0
 PKGNAME=fedora-ds-base
 export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
+#SRCNAME=$PKGNAME-$VERSION-$DATE
+SRCNAME=$PKGNAME-$VERSION
 
-cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $PKGNAME-$VERSION-$DATE ldapserver
+cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver
 
-tar -cjf $PKGNAME-$VERSION-$DATE.tar.bz2 $PKGNAME-$VERSION-$DATE
+tar -cjf $SRCNAME.tar.bz2 $SRCNAME
 
-rm -rf $PKGNAME-$VERSION-$DATE
+rm -rf $SRCNAME


Index: fedora-ds-base-devel.README
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base-devel.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-base-devel.README	23 Feb 2007 21:03:51 -0000	1.1
+++ fedora-ds-base-devel.README	13 Aug 2007 15:48:12 -0000	1.2
@@ -2,4 +2,4 @@
 Fedora Directory Server visit.
 
 http://www.redhat.com/docs/manuals/dir-server/plugin/contents.htm
-http://directory.fedora.redhat.com/wiki/Plugins
+http://directory.fedoraproject.org/wiki/Plugins


Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/fedora-ds-base.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-base.spec	20 Jul 2007 21:55:33 -0000	1.4
+++ fedora-ds-base.spec	13 Aug 2007 15:48:12 -0000	1.5
@@ -1,14 +1,13 @@
-# cvsdate should correspond to the cvsdate in the fedora-ds-cvs.sh script
-%{!?cvsdate:%define cvsdate   20070720}
 
 %define shortname fedora-ds
+%define pkgname   dirsrv
 
 Summary:          Fedora Directory Server (base)
 Name:             fedora-ds-base
 Version:          1.1.0
-Release:          0.3.%{?cvsdate}%{?dist}
+Release:          1.1%{?dist}
 License:          GPL plus extensions
-URL:              http://directory.fedora.redhat.com/
+URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,7 +46,7 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 
-Source0:          %{name}-%{version}-%{cvsdate}.tar.bz2
+Source0:          %{name}-%{version}.tar.bz2
 # fedora-ds-cvs.sh should be used to generate the source tarball from CVS
 Source1:          %{name}-cvs.sh
 Source2:          %{name}-devel.README
@@ -66,7 +65,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{cvsdate}
+%setup -q -n %{name}-%{version}
 cp %{SOURCE2} README.devel
 
 %build
@@ -86,35 +85,35 @@
 
 make DESTDIR="$RPM_BUILD_ROOT" install
 
-mkdir -p $RPM_BUILD_ROOT/var/log/%{shortname}
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{shortname}
-mkdir -p $RPM_BUILD_ROOT/var/lock/%{shortname}
-mkdir -p $RPM_BUILD_ROOT/var/tmp/%{shortname}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{shortname}
+mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname}
+mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkgname}
+mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname}
+mkdir -p $RPM_BUILD_ROOT/var/tmp/%{pkgname}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{pkgname}
 
 #remove libtool and static libs
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{shortname}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{shortname}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{shortname}/plugins/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{shortname}/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
 
-install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{shortname}/
+install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/
 
 # make sure perl scripts have a proper shebang 
-sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{shortname}/script-templates/template-*.pl
+sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add %{shortname}
+/sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
 
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service %{shortname} stop >/dev/null 2>&1 || :
-        /sbin/chkconfig --del %{shortname}
+        /sbin/service %{pkgname} stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del %{pkgname}
 fi
 
 %postun -p /sbin/ldconfig
@@ -122,33 +121,37 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION
-%dir %{_sysconfdir}/%{shortname}
-%dir %{_sysconfdir}/%{shortname}/schema
-%config(noreplace)%{_sysconfdir}/%{shortname}/schema/*.ldif
-%dir %{_sysconfdir}/%{shortname}/config
-%config(noreplace)%{_sysconfdir}/%{shortname}/config/slapd-collations.conf
-%config(noreplace)%{_sysconfdir}/%{shortname}/config/certmap.conf
-%{_datadir}/%{shortname}
-%{_initrddir}/%{shortname}
+%dir %{_sysconfdir}/%{pkgname}
+%dir %{_sysconfdir}/%{pkgname}/schema
+%config(noreplace)%{_sysconfdir}/%{pkgname}/schema/*.ldif
+%dir %{_sysconfdir}/%{pkgname}/config
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf
+%config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
+%{_datadir}/%{pkgname}
+%{_initrddir}/%{pkgname}
 %{_bindir}/*
 %{_sbindir}/*
-%dir %{_libdir}/%{shortname}
-%{_libdir}/%{shortname}/*.so.*
-%{_libdir}/%{shortname}/perl
-%dir %{_libdir}/%{shortname}/plugins
-%{_libdir}/%{shortname}/plugins/*.so
-%dir %{_localstatedir}/lib/%{shortname}
-%dir %{_localstatedir}/log/%{shortname}
-%dir %{_localstatedir}/lock/%{shortname}
-%dir %{_localstatedir}/tmp/%{shortname}
+%dir %{_libdir}/%{pkgname}
+%{_libdir}/%{pkgname}/*.so.*
+%{_libdir}/%{pkgname}/perl
+%dir %{_libdir}/%{pkgname}/plugins
+%{_libdir}/%{pkgname}/plugins/*.so
+%dir %{_localstatedir}/lib/%{pkgname}
+%dir %{_localstatedir}/log/%{pkgname}
+%dir %{_localstatedir}/lock/%{pkgname}
+%dir %{_localstatedir}/tmp/%{pkgname}
 
 %files devel
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION README.devel
-%{_includedir}/%{shortname}
-%{_libdir}/%{shortname}/*.so
+%{_includedir}/%{pkgname}
+%{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Fri Aug 10 2007 Rich Megginson <rmeggins at redhat.com> - 1.1.0-1.1
+- Change pathnames to use the pkgname macro which is dirsrv
+- get rid of cvsdate in source name
+
 * Fri Jul 20 2007 Rich Megginson <rmeggins at redhat.com> - 1.1.0-0.3.20070720
 - Added Requires for perldap, cyrus sasl plugins
 - Removed template-migrate* files


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jul 2007 21:55:33 -0000	1.6
+++ sources	13 Aug 2007 15:48:12 -0000	1.7
@@ -1,2 +1 @@
-0680a1fa973a2edee3eb8f1a2fa11e3e  fedora-ds-base-1.1.0-20070320.tar.bz2
-ab21111ffeed1f481f946c6a6c8f315b  fedora-ds-base-1.1.0-20070720.tar.bz2
+990f736aeedee53b7bf0952ff1705ac9  fedora-ds-base-1.1.0.tar.bz2


