rpms/gnome-applets/devel .cvsignore, 1.54, 1.55 gnome-applets.spec, 1.243, 1.244 ppp-includes.patch, 1.1, 1.2 sources, 1.57, 1.58

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12682

Modified Files:
	.cvsignore gnome-applets.spec ppp-includes.patch sources 
Log Message:
bring modemlights back for one more round



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	17 Sep 2007 01:34:23 -0000	1.54
+++ .cvsignore	23 Sep 2007 04:03:01 -0000	1.55
@@ -1 +1,2 @@
 gnome-applets-2.20.0.tar.bz2
+gnome-applets-2.9.3.1-modemlights.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- gnome-applets.spec	22 Sep 2007 05:57:00 -0000	1.243
+++ gnome-applets.spec	23 Sep 2007 04:03:01 -0000	1.244
@@ -34,17 +34,20 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.20.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
 Source: 	http://download.gnome.org/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
 Source1:        copy.xsl
+Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
+Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.17.1-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
@@ -65,6 +68,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=479172
 Patch36:	gweather-pc.patch
 
+Patch34:        ppp-includes.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -154,6 +159,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
@@ -168,6 +174,14 @@
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
+# We don't ship gnome-system-tools
+rm -rf modemlights
+tar xjf %{SOURCE2}
+
+%patch3 -p1 -b .ppp-command
+
+%patch34 -p1 -b .ppp-includes
+
 intltoolize --force
 autoconf
 
@@ -320,6 +334,7 @@
 %{_libexecdir}/gweather-applet-2
 %{_libexecdir}/mini_commander_applet
 %{_libexecdir}/mixer_applet2
+%{_libexecdir}/modemlights_applet2
 %{_libexecdir}/multiload-applet-2
 %{_libexecdir}/null_applet
 
@@ -342,6 +357,9 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Sat Sep 22 2007 David Woodhouse <dwmw2 at infradead.org> - 1.2.20.0-4
+- Build modemlights applet again (#301601)
+
 * Sat Sep 22 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-3
 - Make the gweather.pc file less useless
 

ppp-includes.patch:

Index: ppp-includes.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/ppp-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppp-includes.patch	30 Jul 2007 22:09:30 -0000	1.1
+++ ppp-includes.patch	23 Sep 2007 04:03:01 -0000	1.2
@@ -1,10 +1,11 @@
 diff -up gnome-applets-2.19.0/modemlights/modemlights.c.includes gnome-applets-2.19.0/modemlights/modemlights.c
 --- gnome-applets-2.19.0/modemlights/modemlights.c.includes	2007-07-30 18:05:02.000000000 -0400
 +++ gnome-applets-2.19.0/modemlights/modemlights.c	2007-07-30 18:05:13.000000000 -0400
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,8 @@
  #endif
  
  #ifdef __linux__
++#define aligned_u64 unsigned long long __attribute__((aligned(8)))
 +#include <linux/types.h>
  #include <linux/if_ppp.h>
  #include <sys/ioctl.h>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	17 Sep 2007 01:34:23 -0000	1.57
+++ sources	23 Sep 2007 04:03:01 -0000	1.58
@@ -1 +1,2 @@
 985cfc3c58a72e1a92201bf4a4873b87  gnome-applets-2.20.0.tar.bz2
+ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2