Changeset f95f93d in git


Ignore:
Timestamp:
20/09/11 13:38:05 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
8bca531
Parents:
d2da9b8
Message:

Backport change from 1.2.0:
Makefile.am: I can't persuade rpmbuild to work sanely,
and people can just as easily build binary RPMs from the source
tarball as from the srpm, so just remove the rpm target from the
makefile - it's less to have to maintain too.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3713 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd2da9b8 rf95f93d  
     1Tue Sep 20 12:37:25 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * Backport change from 1.2.0:
     4        * Makefile.am: I can't persuade rpmbuild to work sanely,
     5          and people can just as easily build binary RPMs from the source
     6          tarball as from the srpm, so just remove the rpm target from the
     7          makefile - it's less to have to maintain too.
     8
    19Tue Sep 20 12:32:47 GMT 2011  Olly Betts <olly@survex.com>
    210
  • Makefile.am

    rd2da9b8 rf95f93d  
    3434TODO: doc/TODO.htm
    3535        w3m -dump doc/TODO.htm > TODO
    36 
    37 rpm : dist
    38         : # spec file is produced using AC_OUTPUT
    39         echo %_topdir `pwd` > rpmmacros
    40         echo %_rpmdir `pwd` >> rpmmacros
    41         echo %_sourcedir `pwd` >> rpmmacros
    42         echo %_specdir `pwd` >> rpmmacros
    43         echo %_srcrpmdir `pwd` >> rpmmacros
    44         echo %_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm >> rpmmacros
    45         : #
    46         echo macrofiles : `rpm --showrc | sed 's/^macrofiles\> *: //p;d'`:`pwd`/rpmmacros > rpmrc
    47         : #
    48         rm -rf BUILD
    49         mkdir BUILD
    50         : #
    51         rpmbuild -bs --clean --rcfile /usr/lib/rpm/rpmrc:`pwd`/rpmrc survex.spec
    5236
    5337debian : dist
Note: See TracChangeset for help on using the changeset viewer.