Merge remote-tracking branch 'origin/master' into el6

Update to 1.7.7 for el6.
dist-git conversion
2011-09-24 18:21:19 -06:00 · 2010-07-29 15:45:55 +00:00 · 2010-03-29 21:54:13 +00:00 · 2010-03-29 21:22:51 +00:00 · 2009-11-26 01:31:40 +00:00 · 2009-09-29 07:21:35 +00:00
2 changed files with 16 additions and 1 deletions
--- a/xfce4-notes-plugin-1.7.3-dsofix.patch
+++ b/xfce4-notes-plugin-1.7.3-dsofix.patch
@ -0,0 +1,11 @@
+--- xfce4-notes-plugin-1.7.3.orig/src/Makefile.in	2010-03-27 09:36:43.000000000 +0100
+++ xfce4-notes-plugin-1.7.3/src/Makefile.in	2010-03-27 12:31:56.000000000 +0100
+@@ -210,7 +210,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lm
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
--- a/xfce4-notes-plugin.spec
+++ b/xfce4-notes-plugin.spec
@ -29,7 +29,6 @@ background color and much more.
 %prep
 %setup -q

-
 %build
 %configure --disable-static
 V=1 make %{?_smp_mflags}
@ -39,7 +38,12 @@ V=1 make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 %find_lang %{name}
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
+desktop-file-validate \
+    $RPM_BUILD_ROOT/%{_datadir}/applications/xfce4-notes.desktop

 desktop-file-validate \
    $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/xfce4-notes-autostart.desktop
Author	SHA1	Message	Date
Kevin Fenzi	6f7dc062a9	Merge remote-tracking branch 'origin/master' into el6 Update to 1.7.7 for el6.	2011-09-24 18:21:19 -06:00
Fedora Release Engineering	b7c66f45b4	dist-git conversion	2010-07-29 15:45:55 +00:00
Christoph Wickert	56efdd3327	obviously the DSO linkage problems are not fixed, although upstream said so	2010-03-29 21:54:13 +00:00
Christoph Wickert	1b0c5ecb5a	- Update to 1.7.4 - Use exo-open to open URLs (#577548) - Drop patch for DSO linking problems, fixed upstream	2010-03-29 21:22:51 +00:00
Bill Nottingham	489bbadddf	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:31:40 +00:00
Jesse Keating	e4aa31ad77	Initialize branch F-12 for xfce4-notes-plugin	2009-09-29 07:21:35 +00:00