[eekboard/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17
by Daiki Ueno
commit be3252079301c1bafbfb17a0e36f8b49d72c6e09
Merge: 1559d8a 13d6fc4
Author: Daiki Ueno <ueno(a)unixuser.org>
Date: Sun Apr 1 08:49:00 2012 +0900
Merge remote-tracking branch 'origin/master' into f17
eekboard.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
11Â years, 8Â months
[eekboard] Add provides/obsoletes for -python subpackage (fixes #808634).
by Daiki Ueno
commit 13d6fc47d18a56b7dd653ca82db8c506a2189adf
Author: Daiki Ueno <ueno(a)unixuser.org>
Date: Sun Apr 1 08:29:22 2012 +0900
Add provides/obsoletes for -python subpackage (fixes #808634).
eekboard.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/eekboard.spec b/eekboard.spec
index 881be03..90fcb2c 100644
--- a/eekboard.spec
+++ b/eekboard.spec
@@ -1,6 +1,6 @@
Name: eekboard
Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Yet Another Virtual Keyboard
Group: Applications/System
@@ -22,6 +22,9 @@ BuildRequires: gobject-introspection-devel
BuildRequires: libcroco-devel
BuildRequires: vala-tools
+Provides: eekboard-python = %{version}-%{release}
+Obsoletes: eekboard-python < 1.0.5-5
+
%description
eekboard is a virtual keyboard software package, including a set of
tools to implement desktop virtual keyboards.
@@ -122,10 +125,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sat Mar 31 2012 Daiki Ueno <dueno(a)redhat.com> - 1.0.6-2
+- Add provides/obsoletes for -python subpackage (fixes #808634)
+
* Fri Mar 30 2012 Daiki Ueno <dueno(a)redhat.com> - 1.0.6-1
- new upstream release
- drop IBus dependency
-- drop Python binding.
+- drop Python binding
* Tue Mar 6 2012 Takao Fujiwara <tfujiwar(a)redhat.com> - 1.0.5-4
- Rebuild for ibus 1.4.99.20120304
11Â years, 8Â months
[mingw-libgcrypt] Simplify the use of mingw macros
by Erik van Pienbroek
commit a8dbd482315185a2b11f9603b0310dde52c53e23
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Sat Mar 31 21:56:20 2012 +0200
Simplify the use of mingw macros
- Simplify the use of mingw macros
- Improved the win64 patch a bit (shouldn't have any visible effects)
...correct-datatype-for-GetProcessWorkingSet.patch | 2 +-
mingw-libgcrypt.spec | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
index 7d0c9fb..86924eb 100644
--- a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
+++ b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
@@ -5,7 +5,7 @@
HANDLE handle;
FILETIME creationTime, exitTime, kernelTime, userTime;
- DWORD minimumWorkingSetSize, maximumWorkingSetSize;
-+ PSIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
++ SIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
handle = GetCurrentThread ();
GetThreadTimes (handle, &creationTime, &exitTime,
diff --git a/mingw-libgcrypt.spec b/mingw-libgcrypt.spec
index f4516e3..d9470cb 100644
--- a/mingw-libgcrypt.spec
+++ b/mingw-libgcrypt.spec
@@ -1,13 +1,10 @@
%?mingw_package_header
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
%define run_tests 0
Name: mingw-libgcrypt
Version: 1.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows gcrypt encryption library
License: LGPLv2+ and GPLv2+
@@ -23,6 +20,8 @@ Source0: libgcrypt-%{version}-hobbled.tar.bz2
Source2: wk(a)g10code.com
Source3: hobble-libgcrypt
+# Upstream is unwilling to accept this patch...
+# https://bugs.g10code.com/gnupg/issue1360
Patch0: libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
# Workaround a bug in libtool:
@@ -105,7 +104,7 @@ popd
%install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make install DESTDIR=$RPM_BUILD_ROOT
# Remove info pages which duplicate what is in Fedora natively.
rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
@@ -142,6 +141,10 @@ rm $RPM_BUILD_ROOT%{mingw64_libdir}/libgcrypt.la
%changelog
+* Sat Mar 31 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.5.0-2
+- Simplify the use of mingw macros
+- Improved the win64 patch a bit (shouldn't have any visible effects)
+
* Sun Mar 11 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.5.0-1
- Update to 1.5.0
- Added win64 support
11Â years, 8Â months
[cloud-init] Fixed incorrect interpretation of relative path for AuthorizedKeysFile (BZ #735521)
by Andy Grimm
commit 83d60c4decd690f1f3c0c10fc722fb3d3e84d761
Author: Andy Grimm <agrimm(a)gmail.com>
Date: Sat Mar 31 15:54:53 2012 -0400
Fixed incorrect interpretation of relative path for
AuthorizedKeysFile (BZ #735521)
cloud-init-0.6.3-lp970071.patch | 11 +++++++++++
cloud-init.spec | 9 ++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/cloud-init-0.6.3-lp970071.patch b/cloud-init-0.6.3-lp970071.patch
new file mode 100644
index 0000000..0fe9376
--- /dev/null
+++ b/cloud-init-0.6.3-lp970071.patch
@@ -0,0 +1,11 @@
+--- cloud-init-0.6.3-bzr532.orig/cloudinit/SshUtil.py 2012-03-05 14:05:34.000000000 -0500
++++ cloud-init-0.6.3-bzr532/cloudinit/SshUtil.py 2012-03-31 15:21:30.365271359 -0400
+@@ -155,6 +155,8 @@
+ akeys = ssh_cfg.get("AuthorizedKeysFile", "%h/.ssh/authorized_keys")
+ akeys = akeys.replace("%h", pwent.pw_dir)
+ akeys = akeys.replace("%u", user)
++ if not akeys.startswith('/'):
++ akeys = os.path.join(pwent.pw_dir, akeys)
+ authorized_keys = akeys
+ except Exception:
+ authorized_keys = '%s/.ssh/authorized_keys' % pwent.pw_dir
diff --git a/cloud-init.spec b/cloud-init.spec
index 585db44..bf19af3 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -2,7 +2,7 @@
Name: cloud-init
Version: 0.6.3
-Release: 0.1.bzr532%{?dist}
+Release: 0.2.bzr532%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
@@ -16,6 +16,8 @@ Patch0: cloud-init-0.6.3-fedora.patch
# Make runparts() work on Fedora
# https://bugs.launchpad.net/cloud-init/+bug/934404
Patch1: cloud-init-0.6.3-no-runparts.patch
+# https://bugs.launchpad.net/cloud-init/+bug/970071
+Patch2: cloud-init-0.6.3-lp970071.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +52,7 @@ ssh keys and to let the user run various scripts.
%setup -q -n %{name}-%{version}-bzr532
%patch0 -p0
%patch1 -p0
+%patch2 -p1
cp -p %{SOURCE2} README.fedora
@@ -131,6 +134,10 @@ fi
%changelog
+* Sat Mar 31 2012 Andy Grimm <agrimm(a)gmail.com> - 0.6.3-0.2.bzr532
+- Fixed incorrect interpretation of relative path for
+ AuthorizedKeysFile (BZ #735521)
+
* Mon Mar 5 2012 Garrett Holmstrom <gholms(a)fedoraproject.org> - 0.6.3-0.1.bzr532
- Rebased against upstream rev 532
- Fixed runparts() incompatibility with Fedora
11Â years, 8Â months
[codemodel/f17: 3/3] Remove istack-commons-dependency
by Juan Hernandez
commit 4c9001ae0a1a8e62d90d870a85fcadda20a3fec3
Merge: 2771f37 32e65b3
Author: Juan Hernandez <juan.hernandez(a)redhat.com>
Date: Sat Mar 31 22:04:17 2012 +0200
Remove istack-commons-dependency
This patch removes the dependency on istack-commons. The reason to
do that is that an updated version of the istack-commons will
intruduce a dependency on codemodel, so we need to break this
mutual dependency in advance.
codemodel-2.6-pom.patch | 15 ---
codemodel-remove-istack-commons-dependency.patch | 130 ++++++++++++++++++++++
codemodel.spec | 15 ++-
3 files changed, 140 insertions(+), 20 deletions(-)
---
11Â years, 8Â months
[codemodel/f17] (3 commits) ...Remove istack-commons-dependency
by Juan Hernandez
Summary of changes:
63bf153... First import after review (#789602) (*)
32e65b3... Remove istack-commons-dependency (*)
4c9001a... Remove istack-commons-dependency
(*) This commit already existed in another branch; no separate mail sent
11Â years, 8Â months
[redis] Update to redis 2.4.10
by Silas Sewell
commit a1b09e3afa37e074923a31a2e5d391c6509aa48a
Author: Silas Sewell <silas(a)sewell.org>
Date: Sat Mar 31 15:45:34 2012 -0400
Update to redis 2.4.10
.gitignore | 1 +
redis.spec | 5 ++++-
sources | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c1550e..7f90117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/redis-2.4.6.tar.gz
/redis-2.4.7.tar.gz
/redis-2.4.8.tar.gz
+/redis-2.4.10.tar.gz
diff --git a/redis.spec b/redis.spec
index 20f70ab..581a2ee 100644
--- a/redis.spec
+++ b/redis.spec
@@ -7,7 +7,7 @@
%endif
Name: redis
-Version: 2.4.8
+Version: 2.4.10
Release: 1%{?dist}
Summary: A persistent key-value database
@@ -114,6 +114,9 @@ fi
%{_unitdir}/%{name}.service
%changelog
+* Sat Mar 31 2012 Silas Sewell <silas(a)sewell.org> - 2.4.10-1
+- Update to redis 2.4.10
+
* Fri Feb 24 2012 Silas Sewell <silas(a)sewell.org> - 2.4.8-1
- Update to redis 2.4.8
diff --git a/sources b/sources
index 2eb61fb..49e3310 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
41d394074bcde762872ecb5506f35aee redis-2.4.6.tar.gz
6afffb6120724183e40f1cac324ac71c redis-2.4.7.tar.gz
ac776d25f238b142d3d526cfcdc621ab redis-2.4.8.tar.gz
+71938de99cbb4fdefd74d7571831fa28 redis-2.4.10.tar.gz
11Â years, 8Â months