New upstream release

- Bump OSTree requirements
- Enable hawkey package diff, we have new enough versions
  of libsolv/hawkey
- Enable /usr/bin/atomic symbolic link
This commit is contained in:
Colin Walters 2014-06-22 18:13:40 -04:00
parent 647cc669cf
commit e711f85ad2
3 changed files with 15 additions and 6 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/rpm-ostree-2014.100.tar.xz /rpm-ostree-2014.100.tar.xz
/rpm-ostree-2014.101.tar.xz /rpm-ostree-2014.101.tar.xz
/rpm-ostree-2014.101.5.g87a00be.tar.xz /rpm-ostree-2014.101.5.g87a00be.tar.xz
/rpm-ostree-2014.103.tar.xz

View File

@ -1,7 +1,7 @@
Summary: Client side upgrade program and server side compose tool Summary: Client side upgrade program and server side compose tool
Name: rpm-ostree Name: rpm-ostree
Version: 2014.101.5.g87a00be Version: 2014.103
Release: 1%{?dist} Release: 2%{?dist}
#VCS: https://github.com/cgwalters/rpm-ostree #VCS: https://github.com/cgwalters/rpm-ostree
# This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot" # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
Source0: rpm-ostree-%{version}.tar.xz Source0: rpm-ostree-%{version}.tar.xz
@ -12,7 +12,7 @@ BuildRequires: autoconf automake libtool
# For docs # For docs
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: pkgconfig(ostree-1) >= 2014.4 BuildRequires: pkgconfig(ostree-1) >= 2014.5
BuildRequires: pkgconfig(libgsystem) BuildRequires: pkgconfig(libgsystem)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(rpm)
@ -20,7 +20,7 @@ BuildRequires: pkgconfig(hawkey)
# For now only treecompose requires this # For now only treecompose requires this
#Requires: /usr/bin/yum #Requires: /usr/bin/yum
Requires: ostree >= 2014.3 Requires: ostree >= 2014.5
%description %description
This tool binds together the world of RPM packages with the OSTree This tool binds together the world of RPM packages with the OSTree
@ -32,7 +32,7 @@ on client systems as well as server-side composes.
%build %build
env NOCONFIGURE=1 ./autogen.sh env NOCONFIGURE=1 ./autogen.sh
%configure --disable-silent-rules %configure --disable-silent-rules --enable-patched-hawkey-and-libsolv --enable-usrbinatomic
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -40,11 +40,19 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
%files %files
%doc COPYING README.md %doc COPYING README.md
%{_bindir}/atomic
%{_bindir}/rpm-ostree %{_bindir}/rpm-ostree
%{_libdir}/%{name}/ %{_libdir}/%{name}/
%{_mandir}/man*/*.gz %{_mandir}/man*/*.gz
%changelog %changelog
* Sat Jun 21 2014 Colin Walters <walters@verbum.org>
- New upstream release
- Bump OSTree requirements
- Enable hawkey package diff, we have new enough versions
of libsolv/hawkey
- Enable /usr/bin/atomic symbolic link
* Tue Jun 10 2014 Colin Walters <walters@verbum.org> * Tue Jun 10 2014 Colin Walters <walters@verbum.org>
- New upstream git snapshot - New upstream git snapshot

View File

@ -1 +1 @@
fca40b8e30dbde165e792dd61f93f2b5 rpm-ostree-2014.101.5.g87a00be.tar.xz 5f3ce9aaa20ae06cc21e73495fd93300 rpm-ostree-2014.103.tar.xz