rpms/notification-daemon/devel notification-daemon-0.3.5-remove-libsexy.patch, 1.2, 1.3 notification-daemon.spec, 1.21, 1.22
Colin Walters (walters)
fedora-extras-commits at redhat.com
Tue Jun 10 16:53:24 UTC 2008
Author: walters
Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4735
Modified Files:
notification-daemon-0.3.5-remove-libsexy.patch
notification-daemon.spec
Log Message:
* Tue Jun 10 2008 Colin Walters <walters at redhat.com> -0.3.7.90-0.svn3009
- Update to SVN snapshot 3009 so we can apply:
- Add positioning patch
- Add patch to fix the dist
- Edit libsexy patch to adapt to the fact we're using an SVN export
- Drop upstreamed summary patch
- Add some code in install to delete notification-properties crapplet
notification-daemon-0.3.5-remove-libsexy.patch:
Index: notification-daemon-0.3.5-remove-libsexy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon-0.3.5-remove-libsexy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- notification-daemon-0.3.5-remove-libsexy.patch 24 Mar 2007 03:15:56 -0000 1.2
+++ notification-daemon-0.3.5-remove-libsexy.patch 10 Jun 2008 16:52:41 -0000 1.3
@@ -1,14 +1,3 @@
---- notification-daemon-0.3.5/src/themes/standard/Makefile.in.remove-libsexy 2006-05-25 17:32:39.000000000 -0400
-+++ notification-daemon-0.3.5/src/themes/standard/Makefile.in 2006-05-25 17:33:33.000000000 -0400
-@@ -235,7 +235,7 @@
- target_alias = @target_alias@
- enginedir = $(libdir)/notification-daemon-1.0/engines
- engine_LTLIBRARIES = libstandard.la
--libstandard_la_SOURCES = theme.c
-+libstandard_la_SOURCES = theme.c sexy-url-label.c
- libstandard_la_LDFLAGS = -module -avoid-version
- libstandard_la_LIBADD = $(NOTIFICATION_DAEMON_LIBS)
- INCLUDES = $(NOTIFICATION_DAEMON_CFLAGS)
--- notification-daemon-0.3.5/src/themes/standard/sexy-url-label.c.remove-libsexy 2006-05-25 17:30:45.000000000 -0400
+++ notification-daemon-0.3.5/src/themes/standard/sexy-url-label.c 2006-05-25 17:30:24.000000000 -0400
@@ -0,0 +1,834 @@
Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- notification-daemon.spec 10 Jun 2008 16:17:01 -0000 1.21
+++ notification-daemon.spec 10 Jun 2008 16:52:41 -0000 1.22
@@ -31,7 +31,7 @@
Obsoletes: notify-daemon
-Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.gz
+Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2
Patch0: notification-daemon-0.3.5-remove-libsexy.patch
Patch2: notification-daemon-clipping.patch
Patch3: notification-daemon-svn3009-distfix.patch
@@ -42,15 +42,14 @@
notification specification.
%prep
-%setup -q
+%setup -q -n notification-daemon-svn3009
%patch0 -p1 -b .remove-libsexy
%patch2 -p1 -b .clipping
%patch3 -p0 -b .svn3009-distfix
%patch4 -p0 -b .positioning
%build
-autoreconf
-automake
+./autogen.sh
intltoolize --force
%configure --disable-static
make
@@ -61,6 +60,12 @@
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
+# Really, just use gconftool for this
+rm -f $RPM_BUILD_ROOT/%{_bindir}/notification-properties
+rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop
+rm -f $RPM_BUILD_ROOT/%{_datadir}/notification-daemon/notification-properties.glade
+rmdir $RPM_BUILD_ROOT/%{_datadir}/notification-daemon/
+
rm -f $RPM_BUILD_ROOT/%{_libdir}/notification-daemon-1.0/engines/*.*a
%find_lang %{name}
@@ -103,7 +108,9 @@
- Update to SVN snapshot 3009 so we can apply:
- Add positioning patch
- Add patch to fix the dist
+- Edit libsexy patch to adapt to the fact we're using an SVN export
- Drop upstreamed summary patch
+- Add some code in install to delete notification-properties crapplet
* Sun Apr 6 2008 Jon McCann <jmccann at redhat.com> - 0.3.7-9
- Don't clip text in message bubbles (#441099)
More information about the scm-commits
mailing list