From 17d3ef6bdc08caeee6b299cab252d24d780fbb2c Mon Sep 17 00:00:00 2001 From: crs Date: Fri, 2 Aug 2002 17:57:54 +0000 Subject: [PATCH] finished RPM build rules and changed doxygen configuration to be built by configure and the doxygen documentation to be removed by maintainer-clean. --- Makefile.am | 14 ++++++++++++++ configure.in | 1 + dist/rpm/synergy.spec.in | 21 ++++++++++++--------- doc/{doxygen.cfg => doxygen.cfg.in} | 6 +++--- 4 files changed, 30 insertions(+), 12 deletions(-) rename doc/{doxygen.cfg => doxygen.cfg.in} (99%) diff --git a/Makefile.am b/Makefile.am index a5552932..5c654d54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,22 @@ MAINTAINERCLEANFILES = \ configure \ stamp-h.in \ stamp-h1 \ + doc/doxygen.cfg \ + doc/doxygen/html/* \ $(NULL) # build doxygen documentation doxygen: doxygen doc/doxygen.cfg + +# build RPMs +RPMTOPDIR=/var/tmp/@PACKAGE@-@VERSION@ +dist-rpm: dist + rm -rf $(RPMTOPDIR) + mkdir $(RPMTOPDIR) + (cd $(RPMTOPDIR); mkdir BUILD SOURCES SPECS SRPMS RPMS) + cp @PACKAGE@-@VERSION@.tar.gz $(RPMTOPDIR)/SOURCES + rpm --define '_topdir $(RPMTOPDIR)' -ba dist/rpm/synergy.spec && \ + mv -f $(RPMTOPDIR)/SRPMS/*.rpm . && \ + mv -f $(RPMTOPDIR)/RPMS/*/*.rpm . && \ + rm -rf $(RPMTOPDIR) diff --git a/configure.in b/configure.in index 1bd1fdd6..31983895 100644 --- a/configure.in +++ b/configure.in @@ -83,5 +83,6 @@ cmd/synergyd/Makefile dist/Makefile dist/rpm/Makefile dist/rpm/synergy.spec +doc/doxygen.cfg ]) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index d7e7a4ad..7e8f886b 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -2,16 +2,19 @@ Summary: Mouse and keyboard sharing utility Name: @PACKAGE@ Version: @VERSION@ Release: 1 -Copyright: Copyright (C) 2002 Chris Schoeneman +License: GPL Packager: Chris Schoeneman -Group: FIXME -Prefixes: FIXME +Group: System Environment/Daemons +Prefixes: /usr/bin Source: @PACKAGE@-@VERSION@.tar.gz -URL: FIXME -BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-root +Buildroot: /var/tmp/@PACKAGE@-@VERSION@-root %description -FIXME +Synergy lets you easily share a single mouse and keyboard between +multiple computers with different operating systems, each with its +own display, without special hardware. It's intended for users +with multiple computers on their desk since each system uses its +own display. %prep %setup @@ -23,7 +26,6 @@ make %install # FIXME -- install should install doc files make install DESTDIR=$RPM_BUILD_ROOT -# FIXME -- or maybe: make PREFIX=$RPM_BUILD_ROOT%{prefix} install strip $RPM_BUILD_ROOT/usr/bin/synergy strip $RPM_BUILD_ROOT/usr/bin/synergyd @@ -32,6 +34,7 @@ strip $RPM_BUILD_ROOT/usr/bin/synergyd rm -rf $RPM_BUILD_ROOT %files -%attr(755, root, root) /usr/bin/synergy -%attr(755, root, root) /usr/bin/synergyd +%defattr(-, root, root) +/usr/bin/synergy +/usr/bin/synergyd # FIXME -- add doc files diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg.in similarity index 99% rename from doc/doxygen.cfg rename to doc/doxygen.cfg.in index ceae4d8a..7ffc56c6 100644 --- a/doc/doxygen.cfg +++ b/doc/doxygen.cfg.in @@ -17,13 +17,13 @@ # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = Synergy +PROJECT_NAME = @PACKAGE@ # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.0.0 +PROJECT_NUMBER = @VERSION@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -378,7 +378,7 @@ FILTER_SOURCE_FILES = NO # If the SOURCE_BROWSER tag is set to YES then a list of source files will # be generated. Documented entities will be cross-referenced with these sources. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation.