diff --git a/packaging/.gitignore b/packaging/.gitignore deleted file mode 100644 index ee5b2283..00000000 --- a/packaging/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -ostree-*/ -x86_64/ diff --git a/packaging/91-ostree.preset b/packaging/91-ostree.preset deleted file mode 100644 index ad0970b4..00000000 --- a/packaging/91-ostree.preset +++ /dev/null @@ -1 +0,0 @@ -enable ostree-remount.service diff --git a/packaging/Makefile.dist-packaging b/packaging/Makefile.dist-packaging deleted file mode 100644 index 096aeaba..00000000 --- a/packaging/Makefile.dist-packaging +++ /dev/null @@ -1,40 +0,0 @@ -# -*- mode: Makefile -*- - -GITREV = $$(git describe --always --tags) -GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,') - -srcdir=$(shell dirname `pwd`) -PACKAGE=ostree - -PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG) - -dist-snapshot: - rm -f *.tar.xz - set -x; \ - echo "PACKAGE=$(PACKAGE)"; \ - TARFILE_TMP=$(PKG_VER).tar.tmp; \ - echo "Archiving $(PACKAGE) at $(GITREV)"; \ - (cd ..; git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \ - (cd $$(git rev-parse --show-toplevel); git submodule status) | while read line; do \ - rev=$$(echo $$line | cut -f 1 -d ' '); path=$$(echo $$line | cut -f 2 -d ' '); \ - echo "Archiving $${path} at $${rev}"; \ - (cd $(srcdir)/$$path; git archive --format=tar --prefix=$(PKG_VER)/$$path/ $${rev}) > submodule.tar; \ - tar -A -f $${TARFILE_TMP} submodule.tar; \ - rm submodule.tar; \ - done; \ - mv $(PKG_VER).tar.tmp $(PKG_VER).tar; \ - rm -f $(PKG_VER).tar.xz; \ - xz $(PKG_VER).tar - -srpm: dist-snapshot - (tmpd=`pwd`/tmp-packaging; rm -rf "$${tmpd}"; mkdir "$${tmpd}"; \ - sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > "$${tmpd}/$(PACKAGE).spec"; \ - cp 91-ostree.preset "$${tmpd}"; ln $(PKG_VER).tar.xz "$${tmpd}"; \ - cd "$${tmpd}" && ../rpmbuild-cwd -bs $(PACKAGE).spec && mv *.src.rpm ..) - -rpm: dist-snapshot - rm -f *.rpm - (tmpd=`pwd`/tmp-packaging; rm -rf "$${tmpd}"; mkdir "$${tmpd}"; \ - sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > "$${tmpd}/$(PACKAGE).spec"; \ - cp 91-ostree.preset "$${tmpd}"; ln $(PKG_VER).tar.xz "$${tmpd}"; \ - cd "$${tmpd}" && ../rpmbuild-cwd -bb $(PACKAGE).spec && mv $$(arch)/*.rpm ..) diff --git a/packaging/ostree.spec.in b/packaging/ostree.spec.in deleted file mode 100644 index eff0f353..00000000 --- a/packaging/ostree.spec.in +++ /dev/null @@ -1,120 +0,0 @@ -Summary: Git for operating system binaries -Name: ostree -Version: 2013.7 -Release: 3%{?dist} -#VCS: git:git://git.gnome.org/ostree -Source0: http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/ostree-%{version}.tar.xz -Source1: 91-ostree.preset -License: LGPLv2+ -URL: http://live.gnome.org/OSTree - -# We always run autogen.sh -BuildRequires: autoconf automake libtool -# For docs -BuildRequires: gtk-doc -# Core requirements -BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(e2p) -# Extras -BuildRequires: pkgconfig(libarchive) -BuildRequires: pkgconfig(fuse) -BuildRequires: pkgconfig(libselinux) -BuildRequires: libcap-devel -BuildRequires: gpgme-devel -BuildRequires: pkgconfig(systemd) -BuildRequires: /usr/bin/g-ir-scanner -BuildRequires: dracut -BuildRequires: bison - -# Runtime requirements -Requires: dracut -Requires: systemd-units - -%description -OSTree is a tool for managing bootable, immutable, versioned -filesystem trees. While it takes over some of the roles of tradtional -"package managers" like dpkg and rpm, it is not a package system; nor -is it a tool for managing full disk images. Instead, it sits between -those levels, offering a blend of the advantages (and disadvantages) -of both. - -%package devel -Summary: Development headers for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -The %{name}-devel package includes the header files for the %{name} library. - -%package grub2 -Summary: GRUB2 integration for OSTree -Group: Development/Libraries -Requires: grub2 - -%description grub2 -GRUB2 integration for OSTree - -%package fuse -Summary: FUSE utilities for OSTree -Group: Development/Libraries -Requires: fuse - -%description fuse -%{summary} - -%prep -%setup -q -n ostree-%{version} - -%build -env NOCONFIGURE=1 ./autogen.sh -%configure --disable-silent-rules \ - --enable-gtk-doc \ - --with-selinux \ - --with-dracut=yesbutnoconf -make %{?_smp_mflags} - -%install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" -find $RPM_BUILD_ROOT -name '*.la' -delete -install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-preset/91-ostree.preset - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%systemd_post ostree-remount.service - -%preun -%systemd_preun ostree-remount.service - -%files -%doc COPYING README.md -%{_bindir}/ostree -%{_sbindir}/ostree-prepare-root -%{_sbindir}/ostree-remount -%dir %{_prefix}/lib/dracut/modules.d/98ostree -%{_prefix}/lib/systemd/system/ostree*.service -%{_prefix}/lib/dracut/modules.d/98ostree/* -%{_libdir}/*.so.1* -%{_libdir}/girepository-1.0/OSTree-1.0.typelib -%{_mandir}/man1/*.gz -%{_mandir}/man5/*.gz -%{_prefix}/lib/systemd/system-preset/91-ostree.preset -%dir %{_sysconfdir}/ostree/remotes.d - -%files devel -%{_libdir}/lib*.so -%{_includedir}/* -%{_libdir}/pkgconfig/* -%{_datadir}/ostree -%dir %{_datadir}/gtk-doc/html/ostree -%{_datadir}/gtk-doc/html/ostree -%{_datadir}/gir-1.0/OSTree-1.0.gir - -%files grub2 -%{_sysconfdir}/grub.d/*ostree -%{_libexecdir}/ostree/grub2* - -%files fuse -%{_bindir}/rofiles-fuse diff --git a/packaging/rpmbuild-cwd b/packaging/rpmbuild-cwd deleted file mode 100755 index d0805bb5..00000000 --- a/packaging/rpmbuild-cwd +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# rpmbuild-cwd: -# Run "rpmbuild", defining all RPM variables to use the current directory. -# This matches Fedora's system. -# -# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php) -# Copyright (C) 2010 Red Hat, Inc. -# Written by Colin Walters - -pwd=$(pwd) -exec rpmbuild --define "_sourcedir ${pwd}" --define "_specdir ${pwd}" --define "_builddir ${pwd}" --define "_srcrpmdir ${pwd}" --define "_rpmdir ${pwd}" --define "_buildrootdir ${pwd}/.build" "$@"