rpms/heliodor/devel heliodor-0.1.2-metacity217.patch, NONE, 1.1 heliodor.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Tue Nov 21 15:45:56 UTC 2006


Author: jwilson

Update of /cvs/extras/rpms/heliodor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18929/devel

Modified Files:
	.cvsignore sources 
Added Files:
	heliodor-0.1.2-metacity217.patch heliodor.spec 
Log Message:
auto-import heliodor-0.1.2-4.fc7 on branch devel from heliodor-0.1.2-4.fc7.src.rpm

heliodor-0.1.2-metacity217.patch:

--- NEW FILE heliodor-0.1.2-metacity217.patch ---
diff -ur heliodor-0.1.2.orig/src/main.c heliodor-0.1.2/src/main.c
--- heliodor-0.1.2.orig/src/main.c	2006-11-09 11:07:50.000000000 -0500
+++ heliodor-0.1.2/src/main.c	2006-11-17 14:17:15.000000000 -0500
@@ -1383,7 +1383,7 @@
 
     corners_xregion = XCreateRegion ();
 
-    if (fgeom->top_left_corner_rounded)
+    if (fgeom->top_left_corner_rounded_radius)
     {
 	xrect.x = 0;
 	xrect.y = 0;
@@ -1409,7 +1409,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->top_right_corner_rounded)
+    if (fgeom->top_right_corner_rounded_radius)
     {
 	xrect.x = width - 5;
 	xrect.y = 0;
@@ -1438,7 +1438,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->bottom_left_corner_rounded)
+    if (fgeom->bottom_left_corner_rounded_radius)
     {
 	xrect.x = 0;
 	xrect.y = height - 1;
@@ -1464,7 +1464,7 @@
 	XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
     }
 
-    if (fgeom->bottom_right_corner_rounded)
+    if (fgeom->bottom_right_corner_rounded_radius)
     {
 	xrect.x = width - 5;
 	xrect.y = height - 1;
@@ -1715,16 +1715,16 @@
 	    static decor_color_t color = { 0.0, 0.0, 0.0 };
 	    int			 corners = 0;
 
-	    if (fgeom.top_left_corner_rounded)
+	    if (fgeom.top_left_corner_rounded_radius)
 		corners |= CORNER_TOPLEFT;
 
-	    if (fgeom.top_right_corner_rounded)
+	    if (fgeom.top_right_corner_rounded_radius)
 		corners |= CORNER_TOPRIGHT;
 
-	    if (fgeom.bottom_left_corner_rounded)
+	    if (fgeom.bottom_left_corner_rounded_radius)
 		corners |= CORNER_BOTTOMLEFT;
 
-	    if (fgeom.bottom_right_corner_rounded)
+	    if (fgeom.bottom_right_corner_rounded_radius)
 		corners |= CORNER_BOTTOMRIGHT;
 
 	    if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
Only in heliodor-0.1.2.orig/src: .main.c.swp


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

Summary:        Beryl window decorator with Metacity theme support
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Source only available via svn right now
# svn://svn.beryl-project.org/beryl/tags/release-%{version}/%{name}
Source0:        %{name}-%{version}.tar.bz2
Patch0:         heliodor-0.1.2-metacity217.patch

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

Requires:       beryl-core >= %{version}

BuildRequires:  beryl-core-devel >= %{version}, gnome-desktop-devel
BuildRequires:  metacity, control-center-devel
BuildRequires:  libtool, gettext-devel
BuildRequires:  libwnck-devel


%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.

Heliodor is a gtk-window-decorator for use with beryl
that supports using Metacity themes.


%prep
%setup -q
%if "%{?fedora}" >= "7"
%patch0 -p1 -b .metacity217
%endif
autoreconf -v --install


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_libdir}/window-manager-settings/libberyl.so
%{_bindir}/heliodor
%{_datadir}/gnome/wm-properties/beryl.desktop


%changelog
* Mon Nov 20 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-4
- Remove some R:, let auto lib deps pull them in

* Fri Nov 17 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-3
- Fix for Metacity 2.17+ changes

* Thu Nov 16 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-2
- Trim BR:

* Fri Nov 10 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heliodor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Nov 2006 15:45:07 -0000	1.1
+++ .cvsignore	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+heliodor-0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heliodor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Nov 2006 15:45:07 -0000	1.1
+++ sources	21 Nov 2006 15:45:26 -0000	1.2
@@ -0,0 +1 @@
+2594e689f6f319f8f42a5ef582aac307  heliodor-0.1.2.tar.bz2




More information about the fedora-extras-commits mailing list