diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2013-09-13 12:54:31 -0400 |
|---|---|---|
| committer | Ernie Hershey <ernie.hershey@10gen.com> | 2013-09-25 21:41:28 -0400 |
| commit | 787d2d85a8693dce18137866e5ac969e5f97e66a (patch) | |
| tree | 2fff953fc55d4beb7347fd10828cf71351957230 | |
| parent | cd2f9548a39b1fd215e983610ddb2edd0d694abf (diff) | |
| download | mongo-787d2d85a8693dce18137866e5ac969e5f97e66a.tar.gz | |
SERVER-3579 replace mongo-10gen and mongodb-10gen with mongodb-org
| -rw-r--r-- | buildscripts/packager.py | 11 | ||||
| -rw-r--r-- | debian/mongodb-org-unstable-server.postinst (renamed from debian/mongodb-10gen-unstable-server.postinst) | 0 | ||||
| -rw-r--r-- | rpm/mongodb-org-unstable.spec (renamed from rpm/mongo-10gen-unstable.spec) | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/buildscripts/packager.py b/buildscripts/packager.py index ef16b773f08..b6de2d99c5f 100644 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -115,8 +115,9 @@ class Distro(object): def pkgbase(self): # pkgbase is the first part of the package's name on - # this distro. - return "mongo" if re.search("(redhat|fedora|centos)", self.n) else "mongodb" + # this distro (pre-2.5.3 was "mongo" for redhat and + # "mongodb" for debian" + return "mongodb" def archname(self, arch): if re.search("^(debian|ubuntu)", self.n): @@ -553,7 +554,7 @@ def make_rpm(distro, arch, spec, srcdir): # Create the specfile. suffix=spec.suffix() sdir=setupdir(distro, arch, spec) - specfile=srcdir+"rpm/mongo%s.spec" % suffix + specfile=srcdir+"rpm/mongodb%s.spec" % suffix topdir=ensure_dir(os.getcwd()+'/rpmbuild/') for subdir in ["BUILD", "RPMS", "SOURCES", "SPECS", "SRPMS"]: ensure_dir("%s/%s/" % (topdir, subdir)) @@ -595,11 +596,11 @@ def make_rpm(distro, arch, spec, srcdir): oldcwd=os.getcwd() os.chdir(sdir+"/../") try: - sysassert(["tar", "-cpzf", topdir+"SOURCES/mongo%s-%s.tar.gz" % (suffix, spec.pversion(distro)), os.path.basename(os.path.dirname(sdir))]) + sysassert(["tar", "-cpzf", topdir+"SOURCES/mongodb%s-%s.tar.gz" % (suffix, spec.pversion(distro)), os.path.basename(os.path.dirname(sdir))]) finally: os.chdir(oldcwd) # Do the build. - sysassert(["rpmbuild", "-ba", "--target", distro_arch] + flags + ["%s/SPECS/mongo%s.spec" % (topdir, suffix)]) + sysassert(["rpmbuild", "-ba", "--target", distro_arch] + flags + ["%s/SPECS/mongodb%s.spec" % (topdir, suffix)]) r=distro.repodir(arch) ensure_dir(r) # FIXME: see if some combination of shutil.copy<hoohah> and glob diff --git a/debian/mongodb-10gen-unstable-server.postinst b/debian/mongodb-org-unstable-server.postinst index 4d0e786ef87..4d0e786ef87 100644 --- a/debian/mongodb-10gen-unstable-server.postinst +++ b/debian/mongodb-org-unstable-server.postinst diff --git a/rpm/mongo-10gen-unstable.spec b/rpm/mongodb-org-unstable.spec index 8e1ba4cd058..d42ae617602 100644 --- a/rpm/mongo-10gen-unstable.spec +++ b/rpm/mongodb-org-unstable.spec @@ -1,12 +1,12 @@ -Name: mongo-10gen-unstable -Conflicts: mongo, mongo-10gen, mongo-10gen-enterprise +Name: mongodb-org-unstable +Conflicts: mongo, mongo-10gen, mongo-10gen-enterprise, mongodb, mongodb-org, mongodb-org-enterprise Version: 2.4.3 Release: mongodb_1%{?dist} Summary: MongoDB server, shell, sharding server and tools License: AGPL 3.0 URL: http://www.mongodb.org Group: Applications/Databases -Requires: mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-mongos, mongo-10gen-unstable-tools +Requires: mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-mongos, mongodb-org-unstable-tools Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root |