Changeset 926 for server/fedora


Ignore:
Timestamp:
Jan 1, 2009, 11:02:16 PM (16 years ago)
Author:
quentin
Message:
Use an RPM macro instead of sed to specify package versions
Location:
server/fedora
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • server/fedora/Makefile

    r923 r926  
    131131$(filter-out %.i386,$(oursrc)): %: setup
    132132        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    133         rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/$**.spec
     133        version=`svnversion ${oursrcdir}/$**`; \
     134        version=$${version//:/_}; \
     135        rpmbuild $(rpmbuild_args) --define "scriptsversion $${version}" -bb ${tmp_specs}/$**.spec
    134136
    135137$(upstream): setup patch-specs
    136         rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$@.spec
     138        version=`svnversion ${patches}`; \
     139        version=$${version//:/_}; \
     140        rpmbuild $(rpmbuild_args) --define "scriptsversion $${version}" -ba ${tmp_specs}/$@.spec
    137141
    138142openafs-kernel: setup

  • server/fedora/specs/accountadm.spec

    r921 r926  
    22Group: Applications/System
    33Name: accountadm
    4 Version: 0.SVNVERSION_TO_UPDATE
     4Version: 0.%{scriptsversion}
    55Release: 0
    66Vendor: The scripts.mit.edu Team (scripts@mit.edu)

  • server/fedora/specs/execsys.spec

    r922 r926  
    22Group: Applications/System
    33Name: execsys
    4 Version: 0.SVNVERSION_TO_UPDATE
     4Version: 0.%{scriptsversion}
    55Release: 0
    66Vendor: The scripts.mit.edu Team (scripts@mit.edu)

  • server/fedora/specs/httpd.spec.patch

    r925 r926  
    11--- httpd.spec.orig     2009-01-01 21:06:31.000000000 -0500
    2 +++ httpd.spec  2009-01-01 21:08:14.000000000 -0500
     2+++ httpd.spec  2009-01-01 22:52:19.000000000 -0500
     3@@ -6,7 +6,7 @@
     4 Summary: Apache HTTP Server
     5 Name: httpd
     6 Version: 2.2.9
     7-Release: 1%{?dist}
     8+Release: 1%{?dist}.scripts.%{scriptsversion}
     9 URL: http://httpd.apache.org/
     10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
     11 Source1: index.html
    312@@ -54,6 +54,11 @@
    413 Conflicts: pcre < 4.0

  • server/fedora/specs/httpdmods.spec

    r917 r926  
    22Group: Applications/System
    33Name: httpdmods
    4 Version: 0.SVNVERSION_TO_UPDATE
     4Version: 0.%{scriptsversion}
    55Release: 0
    66Vendor: The scripts.mit.edu Team (scripts@mit.edu)

  • server/fedora/specs/krb5.spec.patch

    r925 r926  
    11--- krb5.spec.orig      2009-01-01 21:06:35.000000000 -0500
    2 +++ krb5.spec   2009-01-01 21:10:27.000000000 -0500
     2+++ krb5.spec   2009-01-01 22:53:25.000000000 -0500
    33@@ -16,7 +16,7 @@
    44 Summary: The Kerberos network authentication system.
    … …  
    66 Version: 1.6.3
    77-Release: 10%{?dist}
    8 +Release: 10.scripts%{?dist}
     8+Release: 10%{?dist}.scripts.%{scriptsversion}
    99 # Maybe we should explode from the now-available-to-everybody tarball instead?
    1010 # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar

  • server/fedora/specs/logview.spec

    r920 r926  
    22Group: Applications/System
    33Name: logview
    4 Version: 0.SVNVERSION_TO_UPDATE
     4Version: 0.%{scriptsversion}
    55Release: 0
    66Vendor: The scripts.mit.edu Team (scripts@mit.edu)

  • server/fedora/specs/openafs.spec.patch

    r925 r926  
    11--- openafs.spec.orig   2009-01-01 13:46:41.000000000 -0500
    2 +++ openafs.spec        2009-01-01 13:58:29.000000000 -0500
     2+++ openafs.spec        2009-01-01 22:52:30.000000000 -0500
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
    … …  
    66 #%define pkgrel 0.1.rc1
    77-%define pkgrel 1.1
    8 +%define pkgrel 1.1.scripts
     8+%define pkgrel 1.1.scripts.%{scriptsversion}
    99 
    1010 %if %{?osvers:0}%{!?osvers:1}

  • server/fedora/specs/openssh.spec.patch

    r925 r926  
    11--- openssh.spec.orig   2009-01-01 21:06:01.000000000 -0500
    2 +++ openssh.spec        2009-01-01 21:11:41.000000000 -0500
     2+++ openssh.spec        2009-01-01 22:52:02.000000000 -0500
     3@@ -63,7 +63,7 @@
     4 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
     5 Name: openssh
     6 Version: 5.1p1
     7-Release: 3%{?dist}%{?rescue_rel}
     8+Release: 3%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
     9 URL: http://www.openssh.com/portable.html
     10 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
     11 #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
    312@@ -74,6 +74,7 @@
    413 Source1: openssh-nukeacss.sh

  • server/fedora/specs/sql-signup.spec

    r917 r926  
    22Group:                  Applications/System
    33Name:           sql-signup
    4 Version:        0.SVNVERSION_TO_UPDATE
     4Version:        0.%{scriptsversion}
    55Release:        0
    66Vendor:                 The scripts.mit.edu Team (scripts@mit.edu)

  • server/fedora/specs/tokensys.spec

    r921 r926  
    22Group: Applications/System
    33Name: tokensys
    4 Version: 0.SVNVERSION_TO_UPDATE
     4Version: 0.%{scriptsversion}
    55Release: 0
    66Vendor: The scripts.mit.edu Team (scripts@mit.edu)
Note: See TracChangeset for help on using the changeset viewer.