Mike,
Will you please look this over and commit it for me? It passes regression test
for compiling RPMs all the way back to 0.29.0 through to 7545 on the trunk.
Patch included as a .tar.gz to be mailer friendly and to minimize bandwidth.
Thanks much.
------------------------------ Log message -------------------------------
* packages/rpm/mandrake-9.1/subversion.spec
(definitions):
strict_mode flag added for --enable-maintainer-mode compile if needed
man_32, man_31 - added for version specific man pages
use_fop - allow html docs to be built even when fop missing
build_dir - corrected location
svnadmin - future admin macro
(%package doc, %package raw-doc)
- new order
- obsoletes raw-doc when installed
- raw-doc conflicts doc sub-package if installed
(%package common):
- new order
- obsoletes base sub-package.
- provides svnversion
(%package repos-common)
- new order
- client and repository use symmetric naming convention for sub-packages
- provides svnadmin, svnlook, svndumpfilter
- obsoletes repos sub-package
- requires repos-local sub-package
- requires common sub-package
(%package repos-svn)
- new order
- new sub-package
- client and repository use symmetric naming convention for sub-packages
- provides svnserve
- changed sub-package base reference to sub-package common
- changed sub-package repos reference to sub-package repos-local
(%package repos-local)
- new order
- client and repository use symmetric naming convention for sub-packages
- obsoletes repos sub-package
- changed sub-package base reference to sub-package common
(%package repos-dav)
- new order
- client and repository use symmetric naming convention for sub-packages
- obsoletes server sub-package
- changed sub-package base reference to sub-package common
- changed sub-package repos reference to sub-package repos-local
(%package client-common)
- provides svn
(%package client-dav)
- identifies that it provides WebDAV protocol access for a svn client, not
just the svn command line client.
(%package client-svn)
- identifies that it provides svn protocol access for a svn client, not
just the svn command line client.
(%package client-local)
- identifies that it provides local protocol access for a svn client, not
just the svn command line client.
- requires sub-package repos-local and repos-common
- removes reference to sub-package repos
(%package devel)
- changed sub-package base reference to sub-package common
(%package tools)
- changed sub-package base reference to sub-package common
(%package javahl)
- changed sub-package base reference to sub-package common
(%files doc,raw-doc)
- added /book and /misc-docs document directories for compiled docs
- added raw /doc directory to compiled docs
(%files common)
- former base sub-package
- svnversion man page added v0.32.x and higher
- removed all other man pages
- removed svnserve program
- individual documentation files HACKING, BUGS, CHANGES,COPYING,
README, IDEAS (IDEAS was removed after v0.29.0)
- flagged man and doc directories as documentation.
(%files repos-common)
- only svnadmin, svnlook and svndumpfilter programs present.
- man pages added for versions as added (v0.31.0 and v0.32.0)
- man pages marked as documentation
- added svnadmin.static file
(%files repos-svn)
- svnserve program moved to here.
- man page for svnserve added in v0.32.x
- man pages marked as documentation.
(%files repos-local)
- former repos sub-package
- all programs removed to new sub-package (repos-common)
- all man pages moved to same sub-pacakge
- only libraries remain
(%files client-common)
- man pages flagged as documentation
(%build)
- svnadmin.static compile instructions added
- autogen.sh call silent when silent compile requested.
- strict_mode compile flags added
- added messages to indicate compile sub-step (static, shared etc).
- documentation compiled in html if docbook present and fop missing
- INSTALL_DOC_DIR cmd line parameter added to documenation compilation
- INSTALL_DIR cmd line parameter removed to documenation compilation
(%install)
- svnadmin.static installation added
- html documenation installation when fop missing but docbook present
- contrib installation added to tools directory (needs more work).
- generic documentation installation added (HACKING, COPYING CHANGES,
README, BUGS, IDEAS) (IDEAS removed after v0.29.0)
- INSTALL_DOC_DIR cmd line parameter added to documenation installation
- INSTALL_DIR cmd line parameter removed to documenation installation.
(%postun doc, %postun raw-doc)
- scriptlet avoids ls error condition
(%postun common)
- -p flag not usable since script contains sh commands.
- added /sbin/ldconfig command
- scriptlet avoids ls error condition
(%preun repos-common)
- correctly copy svnadmin.static on removal (was broken)
(%post repos-dav)
- corrected warning message when unable to start apache
(%preun repos-dav)
- added warning message when unable to stop apache
(%postun repos-dav)
- corrected warning message when unable to start apache
(%post javahl)
- -p flag not usable since script contains sh commands.
- added /sbin/ldconfig command
- renames /usr/lib/subversion to /usr/lib/subversion.rpmsave if needed
- scriptlet creates symlink to /usr/share/subversion-XX.XX.XX
(%postun javahl)
- -p flag not usable since script contains sh commands.
- added /sbin/ldconfig command
- scriptlet avoids ls error condition
- renames /usr/lib/subversion.rpmsave to /usr/lib/subversion if needed
(%post tools)
- -p flag not usable since script contains sh commands.
- added /sbin/ldconfig command
- renames /usr/lib/subversion to /usr/lib/subversion.rpmsave if needed
- scriptlet creates symlink to /usr/share/subversion-XX.XX.XX
(%postun tools)
- -p flag not usable since script contains sh commands.
- added /sbin/ldconfig command
- scriptlet avoids ls error condition
- renames /usr/lib/subversion.rpmsave to /usr/lib/subversion if needed
(%changelog)
- updated changelog
* packages/rpm/mandrake-9.1/svn-book.patch
- INSTALL_DIR cmd line parameter renamed INSTALL_DOC_DIR
* packages/rpm/mandrake-9.1/README
(initial section/preamble) removed.
(introdoction) HOWTO documents and FAQ documents mentioned.
(OPTIONS) added to explain Makefile command line options.
(FINDING RPMS) added to identify RPM sources
(PACKAGES) revamped to match new packages and new names
(NON-RPM BUILDING) removed to appropriate HOWTO document
(CONTACT) contact info changed to match new maintainer
* packages/rpm/mandrake-9.1/Makefile
(NO_ACTIVATION) option removed
(MOD_ENABLE) option added 1/0
(REQUIRE_APACHE2) option removed
(NEED_APACHE2) option added 1/0
(BLESSED) option only 1/0 now
(STRICT) option added 1/0
(FILE DEFINITIONS) moved higher in non-config section
(TRUNK) based on svn_version.h detection now
(TAG) detection added, based on svn_version.h
(RELEASE) depends on CHANGES file in tag directories, otherwise reflects
actual release of tree version
(MAN_31, MAN_32) added to detect man page requirements, version specific
(DOCBOOK_PATH, DOCBOOK) messages indicate what kind of docs will build
(USE_FOP) detect whether FOP present and whether can still build docs w/o
* packages/rpm/mandrake-9.1/FAQ
Added:Q&A format instructions to get new users up to speed on RPM
build set
* packages/rpm/mandrake-9.1/HOWTO-NON_RPM-9.1
Added: Instructions from original README supplied by Mark Proctor
* packages/rpm/mandrake-9.1/HOWTO-NON_RPM-9.2
Added: Instructions from email provided by Mark Proctor
Note: May need further verification on RPMs needed in Mandrake 9.2 due
to updates still being produced by Mandrake 9.2 and possible
clarification of RPMs mentioned which may be required to
run subversion, but not necessarily be required to compile.
--
Shamim Islam
BA BS
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 28 15:22:07 2003