[pachi] Drop vendor tag.
by Jon Ciesla
commit 0e4be462573051a4a0ed05fada1ed2adb7eb8652
Author: Jon Ciesla <limburgher(a)gmail.com>
Date: Tue Apr 30 12:24:56 2013 -0500
Drop vendor tag.
pachi.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/pachi.spec b/pachi.spec
index 029edb7..6ec4f14 100644
--- a/pachi.spec
+++ b/pachi.spec
@@ -1,6 +1,6 @@
Name: pachi
Version: 1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Pachi El Marciano - Platform Game
Group: Amusements/Games
License: GPLv2+
@@ -44,7 +44,7 @@ mv $RPM_BUILD_ROOT%{_var}/lib/games/%{name}/data/scores.dat \
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
@@ -75,12 +75,15 @@ fi
%doc COPYING ChangeLog README
%attr(2755,root,games) %{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%config(noreplace) %attr (0664,root,games) %{_var}/games/%{name}.hs
%changelog
+* Tue Apr 30 2013 Jon Ciesla <limburgher(a)gmail.com> - 1.0-14
+- Drop desktop vendor tag.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
9Â years
[nss-pam-ldapd] Try to handle the uniqueMember/member changeover
by Nalin Dahyabhai
commit 69ffec9f3f73205c705d479b4f2af668eb87b934
Author: Nalin Dahyabhai <nalin(a)redhat.com>
Date: Tue Apr 30 13:27:22 2013 -0400
Try to handle the uniqueMember/member changeover
- in %%post, attempt to rewrite any instances of "map group uniqueMember ..."
to be "map group member ..." in nslcd.conf, as the attribute name changed
in 0.8.4 (via freeipa ticket #3589)
nss-pam-ldapd.spec | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 0024d07..d887d4d 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -34,7 +34,7 @@
Name: nss-pam-ldapd
Version: 0.8.12
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An nsswitch module which uses directory servers
Group: System Environment/Base
License: LGPLv2+
@@ -263,6 +263,16 @@ if grep -q '^gid nslcd' $target ; then
sed -i -e 's,^gid nslcd$,# gid nslcd,g' $target
fi
fi
+# In 0.8.4, the name of the attribute which was expected to contain the DNs of
+# a group's members changed from "uniqueMember" to "member". Change any
+# instances of "map group uniqueMember ..." to "map group member ...", unless
+# "member" is already being mapped, in which case attempting this would
+# probably just confuse things further.
+if grep -E -q "^[[:blank:]]*map[[:blank:]]+group[[:blank:]]+uniqueMember[[:blank:]]" $target ; then
+ if ! grep -E -q "^[[:blank:]]*map[[:blank:]]+group[[:blank:]]+member[[:blank:]]" $target ; then
+ sed -i -r -e "s,^[[:blank:]]*map[[:blank:]]+group[[:blank:]]+uniqueMember[[:blank:]](.*),map group member \1,g" $target
+ fi
+fi
# Create the daemon's /var/run directory if it isn't there.
if ! test -d /var/run/nslcd ; then
mkdir -p -m 0755 /var/run/nslcd
@@ -319,6 +329,11 @@ exit 0
%endif
%changelog
+* Tue Apr 30 2013 Nalin Dahyabhai <nalin(a)redhat.com> 0.8.12-4
+- in %%post, attempt to rewrite any instances of "map group uniqueMember ..."
+ to be "map group member ..." in nslcd.conf, as the attribute name changed
+ in 0.8.4 (via freeipa ticket #3589)
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.8.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
9Â years
[collectd] Add sources
by Ruben Kerkhof
commit 9acaacca39a1a5e3e75bcaeb400f0f596d7eb5a3
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Tue Apr 30 19:21:31 2013 +0200
Add sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index febba60..4ef59cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/collectd-5.2.2.tar.bz2
+/collectd-5.3.0.tar.bz2
diff --git a/sources b/sources
index 76352f5..86672d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29e61411e51845d5ae71ab676078867e collectd-5.2.2.tar.bz2
+1f0eb7b27ada94b22ed881daf788958b collectd-5.3.0.tar.bz2
9Â years
[collectd] Update to collectd 5.3.0
by Ruben Kerkhof
commit 6a09cdb95d721aff67a591a06b805336a7b29283
Author: Ruben Kerkhof <ruben(a)rubenkerkhof.com>
Date: Tue Apr 30 19:15:10 2013 +0200
Update to collectd 5.3.0
9Â years