Skip to content

Commit 18ac005

Browse files
authored
Merge pull request #5 from DrDaveD/elevatepackaging
Eliminate 'packaging' source code level
2 parents 4b7db2e + 0627408 commit 18ac005

File tree

13 files changed

+34
-32
lines changed

13 files changed

+34
-32
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

debian/cvmfs-config-osg.dsc

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# created by obsupdate.sh, do not edit by hand
2+
Debtransform-Tar: cvmfs-config-osg-2.1.tar.gz
3+
Format: 1.0
4+
Version: 2.1.1
5+
Binary: cvmfs-config-osg
6+
Source: cvmfs-config-osg
7+
Maintainer: Dave Dykstra <dwd@fnal.gov>
8+
Section: utils
9+
Priority: extra
10+
Standards-Version: 3.9.6
11+
Build-Depends: debhelper (>= 9)
12+
Homepage: http://github.com/opensciencegrid/cvmfs-config-osg
13+
14+
Package: cvmfs-config-osg
15+
Architecture: all
16+
Depends: ${misc:Depends}
17+
Provides: cvmfs-config
18+
Conflicts: cvmfs-config
19+
Description: CernVM File System configuration for Open Science Grid
20+
The CernVM File System is a client for accessing remote file systems
21+
using HTTP. This package provides the necessary configuration for
22+
accessing filesystems maintained by the Open Science Grid.
23+
Files:
24+
ffffffffffffffffffffffffffffffff 99999 file1
25+
ffffffffffffffffffffffffffffffff 99999 file2

packaging/debian/obsupdate.sh renamed to debian/obsupdate.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,19 @@
66
HERE="`dirname $0`"
77
ME="`basename $0`"
88
PKG="`sed -n 's/^Source: //p' control`"
9-
SPECFILE="../redhat/$PKG.spec"
9+
SPECFILE="../rpm/$PKG.spec"
1010
VERSION="$(grep ^Version: $SPECFILE | awk '{print $2}')"
1111
RPMREL="$(grep '^%define release_prefix' $SPECFILE | awk '{print $3}')"
1212
if [ -z "$RPMREL" ]; then
1313
RPMREL="$(grep '^Release:' $SPECFILE | awk '{print $2}' | cut -d% -f1)"
1414
fi
15-
# if the version is current, increment the release number, else choose 1
16-
DEBREL="`sed -n "s/^Version: ${VERSION}\.${RPMREL}-//p" $PKG.dsc 2>/dev/null`"
17-
if [ -z "$DEBREL" ]; then
18-
DEBREL=1
19-
else
20-
let DEBREL+=1
21-
fi
2215
(
2316
echo "# created by $ME, do not edit by hand"
2417
# The following two lines are OBS "magic" to use the tarball from the rpm
2518
echo "Debtransform-Tar: ${PKG}-${VERSION}.tar.gz"
2619
#echo "Debtransform-Files-Tar: "
2720
echo "Format: 1.0"
28-
echo "Version: ${VERSION}.${RPMREL}-${DEBREL}"
21+
echo "Version: ${VERSION}.${RPMREL}"
2922
echo "Binary: $PKG"
3023
cat control
3124
echo "Files:"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)