rpms/eiciel/devel fedora_sys_usergroups.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 eiciel.spec, 1.7, 1.8 sources, 1.5, 1.6
Chris Weyl (cweyl)
fedora-extras-commits at redhat.com
Sat May 24 20:39:55 UTC 2008
Author: cweyl
Update of /cvs/extras/rpms/eiciel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9573
Modified Files:
.cvsignore eiciel.spec sources
Added Files:
fedora_sys_usergroups.patch
Log Message:
* Sat May 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.9.6.1-1
- update to 0.9.6.1
- patch system user/group bounds; primitive but works :) Should resolve
RH#445667.
- oh, and the nautlius extensions dir seems to have changed. Let's use what
libnautilus-extensions.pc says is the right directory, instead of
hardcoding it.
fedora_sys_usergroups.patch:
--- NEW FILE fedora_sys_usergroups.patch ---
--- src/eiciel_main_controler.cpp.orig 2008-05-24 12:59:13.430750975 -0700
+++ src/eiciel_main_controler.cpp 2008-05-24 13:03:36.936000525 -0700
@@ -50,7 +50,7 @@
setpwent();
while((u = getpwent()) != NULL)
{
- if (mostrarSystem || (u->pw_uid >= 1000))
+ if (mostrarSystem || (u->pw_uid >= 500))
{
llistatUsuaris.insert(u->pw_name);
}
@@ -63,7 +63,7 @@
setgrent();
while ((g = getgrent()) != NULL)
{
- if (mostrarSystem || (g->gr_gid >= 1000))
+ if (mostrarSystem || (g->gr_gid >= 500))
{
llistatGrups.insert(g->gr_name);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 25 Oct 2007 15:48:10 -0000 1.5
+++ .cvsignore 24 May 2008 20:39:09 -0000 1.6
@@ -1 +1 @@
-eiciel-0.9.5.tar.bz2
+eiciel-0.9.6.1.tar.bz2
Index: eiciel.spec
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/eiciel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eiciel.spec 18 Feb 2008 23:04:22 -0000 1.7
+++ eiciel.spec 24 May 2008 20:39:09 -0000 1.8
@@ -1,15 +1,23 @@
Name: eiciel
-Version: 0.9.5
-Release: 2%{?dist}
+Version: 0.9.6.1
+Release: 1%{?dist}
Summary: Graphical access control list (ACL) editor
Group: Applications/System
License: GPLv2+
URL: http://rofi.pinchito.com/eiciel
Source0: http://rofi.pinchito.com/eiciel/download/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# change system user/groups upper bound from 500 to 1000. Works for fedora;
+# anyone wishing to submit a "real" patch that involves querying libuser
+# directly is MORE than welcome to do so :)
+Patch0: fedora_sys_usergroups.patch
+
BuildRequires: libgnomeui-devel gtkmm24-devel libacl-devel nautilus-devel
BuildRequires: desktop-file-utils
+%define ext_dir %(eval "pkg-config --variable=extensiondir libnautilus-extension")
+
%description
Graphical editor for access control lists (ACL)
and extended attributes (XATTR), either as an
@@ -18,21 +26,27 @@
%prep
%setup -q
+%patch0
iconv -f ISO-8859-1 -t UTF-8 AUTHORS > foo
mv foo AUTHORS
-perl -pi -e 's|/home/roger/eiciel/eiciel_0_9_5/install|/usr|' src/eiciel.desktop
+perl -pi -e 's|/home/roger/eiciel/eiciel_0_9_5/install|/usr|' src/%{name}.desktop.in
+
+sed -i '/^Version.*$/d' src/%{name}.desktop.in
%build
-%configure --with-nautilus-extensions-dir=%{_libdir}/nautilus/extensions-1.0
+%configure --with-nautilus-extensions-dir=%{ext_dir}
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
+
make install DESTDIR=%{buildroot}
+
%find_lang %{name}
+
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
@@ -60,12 +74,20 @@
%{_datadir}/gnome/help/%{name}
%{_datadir}/applications/*%{name}*
%{_mandir}/man1/%{name}*
-%{_libdir}/nautilus/extensions-1.0/lib%{name}*
-%exclude %{_libdir}/nautilus/extensions-1.0/*.a
-%exclude %{_libdir}/nautilus/extensions-1.0/*.la
+%{ext_dir}/lib%{name}*
+%exclude %{ext_dir}/*.a
+%exclude %{ext_dir}/*.la
%changelog
+* Sat May 24 2008 Chris Weyl <cweyl at alumni.drew.edu> 0.9.6.1-1
+- update to 0.9.6.1
+- patch system user/group bounds; primitive but works :) Should resolve
+ RH#445667.
+- oh, and the nautlius extensions dir seems to have changed. Let's use what
+ libnautilus-extensions.pc says is the right directory, instead of
+ hardcoding it.
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-2
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eiciel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 25 Oct 2007 15:48:10 -0000 1.5
+++ sources 24 May 2008 20:39:09 -0000 1.6
@@ -1 +1 @@
-5f00fbc97181c7b64ac73c8c8440e418 eiciel-0.9.5.tar.bz2
+9c6231747d0f0a9a932e2fb11c94fa2e eiciel-0.9.6.1.tar.bz2
More information about the fedora-extras-commits
mailing list