rpms/beryl-manager/devel beryl-manager-0.1.1-pidof.patch, NONE, 1.1 beryl-manager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18781/devel

Modified Files:
	.cvsignore sources 
Added Files:
	beryl-manager-0.1.1-pidof.patch beryl-manager.spec 
Log Message:
auto-import beryl-manager-0.1.2-2.fc7 on branch devel from beryl-manager-0.1.2-2.fc7.src.rpm

beryl-manager-0.1.1-pidof.patch:

--- NEW FILE beryl-manager-0.1.1-pidof.patch ---
--- beryl-manager-0.1.1/src/main.c.orig	2006-10-26 11:00:37.000000000 -0400
+++ beryl-manager-0.1.1/src/main.c	2006-10-26 11:00:56.000000000 -0400
@@ -274,7 +274,7 @@
 }
 gboolean is_running(const gchar * command)
 {
-    gchar* cmd = g_strconcat("pidof ", command,NULL);
+    gchar* cmd = g_strconcat("/sbin/pidof ", command,NULL);
     gchar* pret;
     gint i;
 
@@ -442,7 +442,7 @@
                 if (WMs[i].Kill)
                 {
                     gchar * pret;
-                    gchar * cm = g_strconcat("pidof ",WMs[i].Grep,NULL);
+                    gchar * cm = g_strconcat("/sbin/pidof ",WMs[i].Grep,NULL);
 
                     if (!g_spawn_command_line_sync(cm,&pret,NULL,NULL,NULL))
                         g_warning(_("No pidof, this may not work right."));


--- NEW FILE beryl-manager.spec ---
Name:           beryl-manager
Url:            http://www.beryl-project.org/
License:        GPL
Group:          User Interface/Desktops
Version:        0.1.2
Release:        2%{?dist}

Summary:        Beryl window decorator and theme management utility
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0:        http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
Patch0:         beryl-manager-0.1.1-pidof.patch

# libdrm is not available on these arches
ExcludeArch:    s390 s390x ppc64

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, gtk2-devel >= 2.8.0
BuildRequires:  libtool, gettext-devel
BuildRequires:  dbus-glib, dbus-devel, intltool, perl-XML-Parser


%description
Beryl is a combined window manager and compositing
manager that runs on top of Xgl or AIGLX using OpenGL
to provide effects accelerated by a 3D graphics card
on the desktop. Beryl is a community-driven fork of
Compiz.

Beryl-manager is a tray application to keep beryl
up and running, switch window managers, decorators,
launch beryl-settings and the beryl theme tool.


%prep
%setup -q
# Use absolute path to pidof, not in most users' $PATH
%patch0 -p1 -b .pidof
#autoreconf -v --install
#glib-gettextize --copy --force
#intltoolize --automake --copy --force


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/beryl-manager
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/beryl-manager.1.gz


%changelog
* Tue Nov 14 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-2
- Use upstream tarball, now that there is one

* Fri Nov 10 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-1
- New upstream release

* Tue Oct 31 2006 Jarod Wilson <jwilson at redhat.com> 0.1.1-2
- Add missing BR: libtool, gettext-devel

* Thu Oct 26 2006 Jarod Wilson <jwilson at redhat.com> 0.1.1-1
- New upstream release
- Require beryl-core of at least the same version
- Move autoreconf bits to prep section

* Thu Oct 05 2006 Jarod Wilson <jwilson at redhat.com> 0.1.0-2
- Fix for pidof not in users' $PATH

* Tue Oct 03 2006 Jarod Wilson <jwilson at redhat.com> 0.1.0-1
- Initial Fedora build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Nov 2006 21:10:55 -0000	1.1
+++ .cvsignore	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+beryl-manager-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Nov 2006 21:10:55 -0000	1.1
+++ sources	15 Nov 2006 21:11:15 -0000	1.2
@@ -0,0 +1 @@
+50c0235d59369674827ceaec7d36e53b  beryl-manager-0.1.2.tar.bz2