rdieter pushed to sbcl (f22). "1.2.11"
by notificationsï¼ fedoraproject.org
>From 3b6f398c70bef36546428a522b3f29ec92b7b729 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)math.unl.edu>
Date: Thu, 30 Apr 2015 17:50:56 -0500
Subject: 1.2.11
diff --git a/.gitignore b/.gitignore
index 9ff31f4..4f99eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
/sbcl-1.2.?-*-linux-binary.tar.bz2
-/sbcl-1.2.8-documentation-html.tar.bz2
-/sbcl-1.2.8-source.tar.bz2
+/sbcl-1.2.11-documentation-html.tar.bz2
+/sbcl-1.2.11-source.tar.bz2
diff --git a/sbcl-1.0.51-generate_version.patch b/sbcl-1.0.51-generate_version.patch
deleted file mode 100644
index 9711a5a..0000000
--- a/sbcl-1.0.51-generate_version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up sbcl-1.0.51/generate-version.sh.gitfix sbcl-1.0.51/generate-version.sh
---- sbcl-1.0.51/generate-version.sh.gitfix 2011-08-20 18:15:12.000000000 -0500
-+++ sbcl-1.0.51/generate-version.sh 2011-08-22 08:17:12.575478114 -0500
-@@ -2,7 +2,7 @@
- # Not a shell script, but something intended to be sourced from shell scripts
- git_available_p() {
- # Check that (1) we have git (2) this is a git tree.
-- if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null )
-+ if ( test -d .git && which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null )
- then
- echo "ok"
- else
diff --git a/sbcl-1.2.11-generate_version.patch b/sbcl-1.2.11-generate_version.patch
new file mode 100644
index 0000000..6e6a6ab
--- /dev/null
+++ b/sbcl-1.2.11-generate_version.patch
@@ -0,0 +1,12 @@
+diff -up sbcl-1.2.11/generate-version.sh.generate_version sbcl-1.2.11/generate-version.sh
+--- sbcl-1.2.11/generate-version.sh.generate_version 2015-04-30 16:57:05.271114866 -0500
++++ sbcl-1.2.11/generate-version.sh 2015-04-30 16:58:00.375330676 -0500
+@@ -2,7 +2,7 @@
+
+ git_available_p() {
+ # Check that (1) we have git (2) this is a git tree.
+- if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null )
++ if ( test -d .git && which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null )
+ then
+ echo "ok"
+ else
diff --git a/sbcl-1.2.11-optflags.patch b/sbcl-1.2.11-optflags.patch
new file mode 100644
index 0000000..b931d39
--- /dev/null
+++ b/sbcl-1.2.11-optflags.patch
@@ -0,0 +1,81 @@
+diff -up sbcl-1.2.11/contrib/asdf-module.mk.optflags sbcl-1.2.11/contrib/asdf-module.mk
+--- sbcl-1.2.11/contrib/asdf-module.mk.optflags 2015-04-30 16:55:32.813752766 -0500
++++ sbcl-1.2.11/contrib/asdf-module.mk 2015-04-30 16:56:19.636936144 -0500
+@@ -24,6 +24,8 @@ ifeq (Linux,$(UNAME))
+ EXTRA_CFLAGS=-D_GNU_SOURCE
+ endif
+
++EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
++
+ export CC SBCL EXTRA_CFLAGS
+
+ all: $(FASL) $(ASD)
+diff -up sbcl-1.2.11/src/runtime/Config.arm-linux.optflags sbcl-1.2.11/src/runtime/Config.arm-linux
+--- sbcl-1.2.11/src/runtime/Config.arm-linux.optflags 2015-04-27 09:56:49.000000000 -0500
++++ sbcl-1.2.11/src/runtime/Config.arm-linux 2015-04-30 16:55:32.813752766 -0500
+@@ -9,7 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+
+-CFLAGS = -g -marm -march=armv5
++CFLAGS += $(RPM_OPT_FLAGS)
+ #LINKFLAGS += -v -rdynamic -m32
+ NM = ./linux-nm
+
+diff -up sbcl-1.2.11/src/runtime/Config.ppc-linux.optflags sbcl-1.2.11/src/runtime/Config.ppc-linux
+--- sbcl-1.2.11/src/runtime/Config.ppc-linux.optflags 2015-04-27 09:56:49.000000000 -0500
++++ sbcl-1.2.11/src/runtime/Config.ppc-linux 2015-04-30 16:55:32.814752770 -0500
+@@ -9,7 +9,7 @@
+ # provided with absolutely no warranty. See the COPYING and CREDITS
+ # files for more information.
+
+-CFLAGS = -g -m32
++CFLAGS += -g -m32
+ LINKFLAGS += -v -rdynamic -m32
+ NM = ./linux-nm
+
+@@ -19,6 +19,8 @@ ARCH_SRC = ppc-arch.c
+ OS_SRC = linux-os.c ppc-linux-os.c
+ OS_LIBS = -ldl
+
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ ifdef LISP_FEATURE_GENCGC
+ GC_SRC = gencgc.c
+ else
+diff -up sbcl-1.2.11/src/runtime/Config.sparc-linux.optflags sbcl-1.2.11/src/runtime/Config.sparc-linux
+--- sbcl-1.2.11/src/runtime/Config.sparc-linux.optflags 2015-04-27 09:56:49.000000000 -0500
++++ sbcl-1.2.11/src/runtime/Config.sparc-linux 2015-04-30 16:55:32.814752770 -0500
+@@ -28,6 +28,8 @@ else
+ GC_SRC = cheneygc.c
+ endif
+
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ # Nothing to do for after-grovel-headers.
+ .PHONY: after-grovel-headers
+ after-grovel-headers:
+diff -up sbcl-1.2.11/src/runtime/Config.x86-64-linux.optflags sbcl-1.2.11/src/runtime/Config.x86-64-linux
+--- sbcl-1.2.11/src/runtime/Config.x86-64-linux.optflags 2015-04-27 09:56:49.000000000 -0500
++++ sbcl-1.2.11/src/runtime/Config.x86-64-linux 2015-04-30 16:55:32.814752770 -0500
+@@ -44,6 +44,8 @@ endif
+
+ CFLAGS += -fno-omit-frame-pointer
+
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ GC_SRC = gencgc.c
+
+ # Hardened GCC enables PIE by default
+diff -up sbcl-1.2.11/src/runtime/Config.x86-linux.optflags sbcl-1.2.11/src/runtime/Config.x86-linux
+--- sbcl-1.2.11/src/runtime/Config.x86-linux.optflags 2015-04-27 09:56:50.000000000 -0500
++++ sbcl-1.2.11/src/runtime/Config.x86-linux 2015-04-30 16:55:32.814752770 -0500
+@@ -49,6 +49,8 @@ LINKFLAGS += -nopie
+ LDFLAGS += -nopie
+ endif
+
++CFLAGS += $(RPM_OPT_FLAGS)
++
+ GC_SRC = gencgc.c
+
+ # Nothing to do for after-grovel-headers.
diff --git a/sbcl-1.2.8-optflags.patch b/sbcl-1.2.8-optflags.patch
deleted file mode 100644
index bc96ceb..0000000
--- a/sbcl-1.2.8-optflags.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -up sbcl-1.2.8/contrib/asdf-module.mk.optflags sbcl-1.2.8/contrib/asdf-module.mk
---- sbcl-1.2.8/contrib/asdf-module.mk.optflags 2015-01-31 08:24:55.000000000 -0600
-+++ sbcl-1.2.8/contrib/asdf-module.mk 2015-02-13 12:53:48.144358286 -0600
-@@ -27,6 +27,8 @@ ifeq (Linux,$(UNAME))
- EXTRA_CFLAGS=-D_GNU_SOURCE
- endif
-
-+EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
-+
- export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
-
- all: $(FASL) $(ASD) $(EXTRA_ALL_TARGETS)
-diff -up sbcl-1.2.8/src/runtime/Config.arm-linux.optflags sbcl-1.2.8/src/runtime/Config.arm-linux
---- sbcl-1.2.8/src/runtime/Config.arm-linux.optflags 2015-01-31 08:24:57.000000000 -0600
-+++ sbcl-1.2.8/src/runtime/Config.arm-linux 2015-02-13 12:53:48.144358286 -0600
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
-
--CFLAGS = -g -marm -march=armv5
-+CFLAGS += $(RPM_OPT_FLAGS)
- #LINKFLAGS += -v -rdynamic -m32
- NM = ./linux-nm
-
-diff -up sbcl-1.2.8/src/runtime/Config.ppc-linux.optflags sbcl-1.2.8/src/runtime/Config.ppc-linux
---- sbcl-1.2.8/src/runtime/Config.ppc-linux.optflags 2015-01-31 08:24:57.000000000 -0600
-+++ sbcl-1.2.8/src/runtime/Config.ppc-linux 2015-02-13 12:53:48.144358286 -0600
-@@ -9,7 +9,7 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
-
--CFLAGS = -g -m32
-+CFLAGS += -g -m32
- LINKFLAGS += -v -rdynamic -m32
- NM = ./linux-nm
-
-@@ -19,6 +19,8 @@ ARCH_SRC = ppc-arch.c
- OS_SRC = linux-os.c ppc-linux-os.c
- OS_LIBS = -ldl
-
-+CFLAGS += $(RPM_OPT_FLAGS)
-+
- ifdef LISP_FEATURE_GENCGC
- GC_SRC = gencgc.c
- else
-diff -up sbcl-1.2.8/src/runtime/Config.sparc-linux.optflags sbcl-1.2.8/src/runtime/Config.sparc-linux
---- sbcl-1.2.8/src/runtime/Config.sparc-linux.optflags 2015-01-31 08:24:57.000000000 -0600
-+++ sbcl-1.2.8/src/runtime/Config.sparc-linux 2015-02-13 12:53:48.145358308 -0600
-@@ -28,6 +28,8 @@ else
- GC_SRC = cheneygc.c
- endif
-
-+CFLAGS += $(RPM_OPT_FLAGS)
-+
- # Nothing to do for after-grovel-headers.
- .PHONY: after-grovel-headers
- after-grovel-headers:
-diff -up sbcl-1.2.8/src/runtime/Config.x86-64-linux.optflags sbcl-1.2.8/src/runtime/Config.x86-64-linux
---- sbcl-1.2.8/src/runtime/Config.x86-64-linux.optflags 2015-02-13 12:53:51.220426514 -0600
-+++ sbcl-1.2.8/src/runtime/Config.x86-64-linux 2015-02-13 12:54:35.302379698 -0600
-@@ -44,6 +44,8 @@ endif
-
- CFLAGS += -fno-omit-frame-pointer
-
-+CFLAGS += $(RPM_OPT_FLAGS)
-+
- GC_SRC = gencgc.c
-
- # Hardened GCC enables PIE by default
-diff -up sbcl-1.2.8/src/runtime/Config.x86-linux.optflags sbcl-1.2.8/src/runtime/Config.x86-linux
---- sbcl-1.2.8/src/runtime/Config.x86-linux.optflags 2015-01-31 08:24:57.000000000 -0600
-+++ sbcl-1.2.8/src/runtime/Config.x86-linux 2015-02-13 12:53:51.220426514 -0600
-@@ -49,6 +49,8 @@ LINKFLAGS += -nopie
- LDFLAGS += -nopie
- endif
-
-+CFLAGS += $(RPM_OPT_FLAGS)
-+
- GC_SRC = gencgc.c
-
- # Nothing to do for after-grovel-headers.
diff --git a/sbcl.spec b/sbcl.spec
index 668c8bb..a32b96f 100644
--- a/sbcl.spec
+++ b/sbcl.spec
@@ -10,7 +10,7 @@
Name: sbcl
Summary: Steel Bank Common Lisp
-Version: 1.2.8
+Version: 1.2.11
Release: 1%{?dist}
License: BSD
@@ -93,11 +93,11 @@ Source202: sbcl-install-clc.lisp
%endif
Patch2: sbcl-1.1.13-personality.patch
-Patch3: sbcl-1.2.8-optflags.patch
+Patch3: sbcl-1.2.11-optflags.patch
Patch6: sbcl-0.9.5-verbose-build.patch
## upstreamable patches
-Patch50: sbcl-1.0.51-generate_version.patch
+Patch50: sbcl-1.2.11-generate_version.patch
## upstream patches
@@ -120,7 +120,7 @@ interpreter, and debugger.
%prep
-%setup -c -n sbcl-%{version} -a 1 %{?sbcl_bootstrap_src}
+%setup -q -c -n sbcl-%{version} -a 1 %{?sbcl_bootstrap_src}
pushd sbcl-%{version}
@@ -266,6 +266,9 @@ fi
%changelog
+* Thu Apr 30 2015 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.11-1
+- 1.2.11
+
* Fri Feb 13 2015 Rex Dieter <rdieter(a)fedoraproject.org> 1.2.8-1
- 1.2.8
diff --git a/sources b/sources
index 2bf8486..613b5cb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3dc34c657e3be724dfef7c4c069fe383 sbcl-1.2.8-documentation-html.tar.bz2
-bb14259d09651adb8d9d2f892792b295 sbcl-1.2.8-source.tar.bz2
+896dea8eddb004eaa66382c73faf2d3b sbcl-1.2.11-documentation-html.tar.bz2
+ce3d9c18656646ca99773a0ed49ab730 sbcl-1.2.11-source.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/sbcl.git/commit/?h=f22&id=3b6f398c70be...
7Â years, 9Â months
sandeen pushed to e2fsprogs (master). "Don't trigger full fsck within time fudge window"
by notificationsï¼ fedoraproject.org
>From b93e20b747617b0d2f87a9f5573961f8eaf2529a Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen(a)redhat.com>
Date: Thu, 30 Apr 2015 20:09:02 -0500
Subject: Don't trigger full fsck within time fudge window
diff --git a/e2fsprogs-1.42.12-time-fudge.patch b/e2fsprogs-1.42.12-time-fudge.patch
new file mode 100644
index 0000000..c97fc09
--- /dev/null
+++ b/e2fsprogs-1.42.12-time-fudge.patch
@@ -0,0 +1,39 @@
+From f096708126412c0569e40cfbd5740729976bf12a Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso(a)mit.edu>
+Date: Sat, 28 Mar 2015 21:39:54 -0400
+Subject: e2fsck: use PROMPT_NONE for FUTURE_SB_LAST_*_FUDGED problems
+
+This allows us to print a message warning the user that there is
+something funny going on with their hardware clock (probably time zone
+issues caused by trying to be compatible with legacy OS's such as
+Windows), without triggering a full file system check.
+
+Signed-off-by: Theodore Ts'o <tytso(a)mit.edu>
+
+diff --git a/e2fsck/problem.c b/e2fsck/problem.c
+index 12cf836..f442a33 100644
+--- a/e2fsck/problem.c
++++ b/e2fsck/problem.c
+@@ -386,14 +386,14 @@ static struct e2fsck_problem problem_table[] = {
+ /* Last mount time is in the future (fudged) */
+ { PR_0_FUTURE_SB_LAST_MOUNT_FUDGED,
+ N_("@S last mount time is in the future.\n\t(by less than a day, "
+- "probably due to the hardware clock being incorrectly set) "),
+- PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
++ "probably due to the hardware clock being incorrectly set)\n"),
++ PROMPT_NONE, PR_PREEN_OK | PR_NO_OK },
+
+ /* Last write time is in the future (fudged) */
+ { PR_0_FUTURE_SB_LAST_WRITE_FUDGED,
+ N_("@S last write time is in the future.\n\t(by less than a day, "
+- "probably due to the hardware clock being incorrectly set). "),
+- PROMPT_FIX, PR_PREEN_OK | PR_NO_OK },
++ "probably due to the hardware clock being incorrectly set)\n"),
++ PROMPT_NONE, PR_PREEN_OK | PR_NO_OK },
+
+ /* Block group checksum (latch question) is invalid. */
+ { PR_0_GDT_CSUM_LATCH,
+--
+cgit v0.10.2
+
+
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 5d3a24e..eef5262 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,7 +1,7 @@
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
Name: e2fsprogs
Version: 1.42.12
-Release: 4%{?dist}
+Release: 5%{?dist}
# License tags based on COPYING file distinctions for various components
License: GPLv2
@@ -15,6 +15,7 @@ Patch2: e2fsprogs-1.42.12-use-after-free-fix.patch
Patch3: e2fsprogs-1.42.12-closefs-cve.patch
Patch4: e2fsprogs-1.42.12-dumpe2fs-segfault.patch
Patch5: e2fsprogs-1.42.12-resize2fs-fsck.patch
+Patch6: e2fsprogs-1.42.12-time-fudge.patch
Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -158,6 +159,7 @@ It was originally inspired by the Multics SubSystem library.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
@@ -339,6 +341,9 @@ exit 0
%{_libdir}/pkgconfig/ss.pc
%changelog
+* Thu Apr 30 2015 Eric Sandeen <sandeen(a)redhat.com> 1.42.12-5
+- Don't trigger full check within time fudge window (#1202024)
+
* Tue Feb 24 2015 Eric Sandeen <sandeen(a)redhat.com> 1.42.12-4
- Fix potential buffer overflow in closefs (#1193947, CVE-2015-1572)
- Fix dumpe2fs segfault with no arguments (#1194063)
@@ -384,7 +389,7 @@ exit 0
* Mon Jan 20 2014 Eric Sandeen <sandeen(a)redhat.com> 1.42.9-2
- Fix up Source0 URL
-* Thu Jan 01 2014 Eric Sandeen <sandeen(a)redhat.com> 1.42.9-1
+* Thu Jan 02 2014 Eric Sandeen <sandeen(a)redhat.com> 1.42.9-1
- New upstream release
- Re-enable disabled tests for now
@@ -501,7 +506,7 @@ exit 0
* Wed Oct 06 2010 Eric Sandeen <sandeen(a)redhat.com> 1.41.12-6
- Install e4defrag for testing
-* Mon Jul 13 2010 Eric Sandeen <sandeen(a)redhat.com> 1.41.12-5
+* Tue Jul 13 2010 Eric Sandeen <sandeen(a)redhat.com> 1.41.12-5
- Relax fsck requirements for resize2fs -P
* Mon Jul 12 2010 Eric Sandeen <sandeen(a)redhat.com> 1.41.12-4
@@ -559,7 +564,7 @@ exit 0
* Tue Oct 06 2009 Eric Sandeen <sandeen(a)redhat.com> 1.41.9-4
- Fix install with --excludedocs (#515987)
-* Thu Sep 14 2009 Eric Sandeen <sandeen(a)redhat.com> 1.41.9-3
+* Mon Sep 14 2009 Eric Sandeen <sandeen(a)redhat.com> 1.41.9-3
- Drop defrag bits for now, not ready yet.
* Thu Sep 10 2009 Josef Bacik <josef(a)toxicpanda.com> 1.41.9-2
@@ -568,7 +573,7 @@ exit 0
* Sun Aug 23 2009 Eric Sandeen <sandeen(a)redhat.com> 1.41.9-1
- New upstream release
-* Fri Aug 05 2009 Eric Sandeen <sandeen(a)redhat.com> 1.41.8-6
+* Thu Aug 06 2009 Eric Sandeen <sandeen(a)redhat.com> 1.41.8-6
- Fix filefrag in fallback case
- Add e2freefrag & e4defrag (experimental)
@@ -650,10 +655,10 @@ exit 0
- Remove conservative "don't change journal location" patch for F11
- Add btrfs recognition to blkid
-* Mon Oct 03 2008 Eric Sandeen <sandeen(a)redhat.com> 1.41.3-2
+* Fri Nov 07 2008 Eric Sandeen <sandeen(a)redhat.com> 1.41.3-2
- Bump to revision 2, f10 was behind f9, oops.
-* Mon Oct 03 2008 Eric Sandeen <sandeen(a)redhat.com> 1.41.3-1
+* Mon Oct 13 2008 Eric Sandeen <sandeen(a)redhat.com> 1.41.3-1
- New upstream version (very minor fixes, ext4-related)
* Thu Oct 02 2008 Eric Sandeen <sandeen(a)redhat.com> 1.41.2-2
@@ -745,11 +750,11 @@ exit 0
- Ignore some primary/backup superblock flag differences (#428893)
- Teach libblkid about ext4dev.
-* Mon Jan 10 2008 Eric Sandeen <sandeen(a)redhat.com> 1.40.4-4
+* Tue Jan 15 2008 Eric Sandeen <sandeen(a)redhat.com> 1.40.4-4
- Build e2fsck as a dynamically linked binary.
- Re-fix uidd manpage default paths.
-* Tue Jan 09 2008 Eric Sandeen <sandeen(a)redhat.com> 1.40.4-3
+* Mon Jan 14 2008 Eric Sandeen <sandeen(a)redhat.com> 1.40.4-3
- New uuidd subpackage, and properly set up uuidd at install.
* Tue Jan 01 2008 Eric Sandeen <esandeen(a)redhat.com> 1.40.4-2
@@ -784,7 +789,7 @@ exit 0
- Make (more) file timestamps match those in tarball for multilib tidiness
- Fix e2fsprogs-libs summary (shared libs not static)
-* Tue Oct 15 2007 Eric Sandeen <esandeen(a)redhat.com> 1.40.2-9
+* Mon Oct 15 2007 Eric Sandeen <esandeen(a)redhat.com> 1.40.2-9
- Detect big-endian squashfs filesystems in libblkid (#305151)
* Tue Oct 02 2007 Eric Sandeen <esandeen(a)redhat.com> 1.40.2-8
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/e2fsprogs.git/commit/?h=master&id=b93e...
7Â years, 9Â months
apevec pushed to openstack-trove (master). "Kilo release (..more)"
by notificationsï¼ fedoraproject.org
>From 51ed423a29b57ae2bfb886a8fa8f589cedd093aa Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec(a)redhat.com>
Date: Fri, 1 May 2015 02:53:39 +0200
Subject: Kilo release
Change-Id: Ib5c3a41c6f965d9e6f467013a4aa536edb18ca74
diff --git a/.gitignore b/.gitignore
index 59f0072..b3cd4e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/trove-2014.2.tar.gz
/trove-2014.2.2.tar.gz
/trove-2014.2.3.tar.gz
+/trove-2015.1.0.tar.gz
diff --git a/0001-Remove-runtime-dep-on-python-pbr.patch b/0001-Remove-runtime-dep-on-python-pbr.patch
deleted file mode 100644
index 0b338ec..0000000
--- a/0001-Remove-runtime-dep-on-python-pbr.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 99d3c5fb9b89001cbc55eddd92a0de598966e767 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <hguemar(a)fedoraproject.org>
-Date: Mon, 13 Oct 2014 14:59:39 +0200
-Subject: [PATCH] Remove runtime dep on python pbr
-
----
- trove/__init__.py | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/trove/__init__.py b/trove/__init__.py
-index 932f8f7..36b2e63 100644
---- a/trove/__init__.py
-+++ b/trove/__init__.py
-@@ -24,9 +24,26 @@
-
- __all__ = ['__version__']
-
--import pbr.version
-+class VersionInfo(object):
-+ release = "REDHATTROVERELEASE"
-+ version = "REDHATTROVEVERSION"
-
--version_info = pbr.version.VersionInfo('trove')
-+ def version_string(self):
-+ return self.version
-+
-+ def cached_version_string(self):
-+ return self.version
-+
-+ def release_string(self):
-+ return self.release
-+
-+ def canonical_version_string(self):
-+ return self.version
-+
-+ def version_string_with_vcs(self):
-+ return self.release
-+
-+version_info = VersionInfo()
- # We have a circular import problem when we first run python setup.py sdist
- # It's harmless, so deflect it.
- try:
diff --git a/0002-Fix-api-paste.ini.patch b/0002-Fix-api-paste.ini.patch
deleted file mode 100644
index a65a337..0000000
--- a/0002-Fix-api-paste.ini.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From de4508bbc5f4c0027c52c96aa22f1a27c766ee60 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <hguemar(a)fedoraproject.org>
-Date: Mon, 10 Nov 2014 17:29:27 +0100
-Subject: [PATCH] Fix api-paste.ini
-
----
- etc/trove/api-paste.ini | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/etc/trove/api-paste.ini b/etc/trove/api-paste.ini
-index 851da2b..425c4ae 100644
---- a/etc/trove/api-paste.ini
-+++ b/etc/trove/api-paste.ini
-@@ -18,9 +18,6 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory
- auth_host = 127.0.0.1
- auth_port = 35357
- auth_protocol = http
--admin_tenant_name = %SERVICE_TENANT_NAME%
--admin_user = %SERVICE_USER%
--admin_password = %SERVICE_PASSWORD%
- # signing_dir is configurable, but the default behavior of the authtoken
- # middleware should be sufficient. It will create a temporary directory
- # in the home directory for the user the trove process is running as.
diff --git a/openstack-trove.spec b/openstack-trove.spec
index 8638c97..481d469 100644
--- a/openstack-trove.spec
+++ b/openstack-trove.spec
@@ -1,10 +1,10 @@
-%global release_name juno
+%global release_name kilo
%global with_doc 0
%global project trove
Name: openstack-%{project}
-Version: 2014.2.3
-Release: 2%{?dist}
+Version: 2015.1.0
+Release: 1%{?dist}
Summary: OpenStack DBaaS (%{project})
License: ASL 2.0
@@ -20,9 +20,6 @@ Source11: %{name}-taskmanager.service
Source12: %{name}-conductor.service
Source13: %{name}-guestagent.service
-Patch0001: 0001-Remove-runtime-dep-on-python-pbr.patch
-Patch0002: 0002-Fix-api-paste.ini.patch
-
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@ -50,6 +47,7 @@ Requires(postun): systemd
BuildRequires: systemd
Requires(pre): shadow-utils
+Requires: python-pbr
%description common
OpenStack DBaaS (codename %{project}) provisioning service.
@@ -165,10 +163,6 @@ This package contains documentation files for %{project}.
%prep
%autosetup -n %{project}-%{version} -S git
-sed -i s/REDHATTROVEVERSION/%{version}/ trove/__init__.py
-sed -i s/REDHATTROVERELEASE/%{release}/ trove/__init__.py
-
-
# Avoid non-executable-script rpmlint while maintaining timestamps
find %{project} -name \*.py |
while read source; do
@@ -180,8 +174,6 @@ while read source; do
fi
done
-sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/' %{project}/version.py
-
# Remove the requirements file so that pbr hooks don't add it
# to distutils requires_dist config
rm -rf {test-,}requirements.txt
diff --git a/sources b/sources
index 64414d4..653cba1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d00ad82a6b0f43173754a84aecd92595 trove-2014.2.3.tar.gz
+d0c642c5c999b88763421c0475ac0b07 trove-2015.1.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-trove.git/commit/?h=master&i...
7Â years, 9Â months
rdieter pushed to kf5-kio (master). "BR: krb5-devel libacl-devel"
by notificationsï¼ fedoraproject.org
>From 94ca092cda871ae3a37e2093973ae7ec6dfed0b4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)math.unl.edu>
Date: Thu, 30 Apr 2015 19:12:21 -0500
Subject: BR: krb5-devel libacl-devel
diff --git a/kf5-kio.spec b/kf5-kio.spec
index 2a81aaf..c1cef8c 100644
--- a/kf5-kio.spec
+++ b/kf5-kio.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
License: GPLv2+ and MIT and BSD
@@ -17,6 +17,8 @@ URL: http://www.kde.org
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%...
+BuildRequires: krb5-devel
+BuildRequires: libacl-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: zlib-devel
@@ -253,6 +255,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Thu Apr 30 2015 Rex Dieter <rdieter(a)fedoraproject.org> 5.9.0-2
+- BR: krb5-devel libacl-devel
+
* Tue Apr 07 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.9.0-1
- KDE Frameworks 5.9.0
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kf5-kio.git/commit/?h=master&id=94ca09...
7Â years, 9Â months
rdieter pushed to kf5-solid (master). "BR: bison flex media-player-info"
by notificationsï¼ fedoraproject.org
>From 80615ddd7a793c68390de75cc2a313f327673d9f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter(a)math.unl.edu>
Date: Thu, 30 Apr 2015 19:06:16 -0500
Subject: BR: bison flex media-player-info
diff --git a/kf5-solid.spec b/kf5-solid.spec
index d0ffa8f..ad048f4 100644
--- a/kf5-solid.spec
+++ b/kf5-solid.spec
@@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 1 integration module that provides hardware information
License: LGPLv2+
@@ -26,6 +26,15 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt5-qttools-devel
+%if ! 0%{?bootstrap}
+# Predicate parser deps
+BuildRequires: bison
+BuildRequires: flex
+# really runtime-only dep, but doesn't hurt to check availability at buildtime
+BuildRequires: media-player-info
+Requires: media-player-info
+%endif
+
Requires: kf5-filesystem
Provides: %{name}-runtime = %{version}-%{release}
@@ -94,6 +103,9 @@ make %{?_smp_mflags} -C %{_target_platform}
%changelog
+* Thu Apr 30 2015 Rex Dieter <rdieter(a)fedoraproject.org> 5.9.0-2
+- BR: bison flex media-player-info
+
* Tue Apr 07 2015 Daniel Vrátil <dvratil(a)redhat.com> - 5.9.0-1
- KDE Frameworks 5.9.0
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kf5-solid.git/commit/?h=master&id=8061...
7Â years, 9Â months