up to 1.5.2, uses libnotify not matenotify now

diff --git a/mate-applets.spec b/mate-applets.spec
index 6bcc4b711a24a99cce4402928cb80d39b18737b7..4932d54efe931613c4402e7610db3cdb3029933a 100644 (file)
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@ -12,15 +12,14 @@ Summary(pl.UTF-8):  Aplety MATE - małe aplikacje osadzające się w panelu
 Summary(ru.UTF-8):     Маленькие программы, встраивающиеся в панель MATE
 Summary(uk.UTF-8):     Маленькі програми, що вбудовуються в панель MATE
 Name:          mate-applets
-Version:       1.5.1
+Version:       1.5.2
 Release:       0.12
 License:       GPL v2, FDL
 Group:         X11/Applications
 Source0:       http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# Source0-md5: 0d903468bb288c3c05030c36fa5a25c8
+# Source0-md5: 912af4be09fb78405bd4da437b3b7f05
 # check paths in Makefile before removing it!
 #Patch0: m4_fix.patch
-Patch0:                mate-gnome-conflicts.patch
 URL:           https://github.com/mate-desktop/mate-applets
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: NetworkManager-devel >= 0.7
@@ -34,7 +33,7 @@ BuildRequires:        glib2-devel >= 1:2.22.0
 BuildRequires: gtk+2-devel >= 2:2.20.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libgtop-devel >= 1:2.11.92
-BuildRequires: libmatenotify-devel >= 1.1.0
+BuildRequires: libnotify-devel >= 0.7.0
 BuildRequires: libmatewnck-devel >= 1.3.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.5.0
@@ -351,7 +350,6 @@ ale jest przydatny o tyle, że panele są zawsze widoczne.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 NOCONFIGURE=1 ./autogen.sh

diff --git a/mate-gnome-conflicts.patch b/mate-gnome-conflicts.patch
deleted file mode 100644 (file)
index 1238043..0000000
--- a/mate-gnome-conflicts.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mate-applets-1.5.0/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in~  2012-12-08 23:37:32.000000000 +0200
-+++ mate-applets-1.5.0/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in   2012-12-24 23:08:34.722100915 +0200
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.mate.panel.applet.CPUFreqAppletFactory
--Exec=@LIBEXECDIR@/cpufreq-applet
-+Exec=@LIBEXECDIR@/mate-cpufreq-applet
---- mate-applets-1.5.0/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in~ 2012-12-08 23:37:32.000000000 +0200
-+++ mate-applets-1.5.0/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in  2012-12-24 23:09:31.912661587 +0200
-@@ -1,6 +1,6 @@
- [Applet Factory]
- Id=CPUFreqAppletFactory
--Location=@LIBEXECDIR@/cpufreq-applet
-+Location=@LIBEXECDIR@/mate-cpufreq-applet
- _Name=CPU Frequency Scaling Monitor
- _Description=Monitor the CPU Frequency Scaling
- 
---- mate-applets-1.5.0/cpufreq/src/Makefile.am~        2012-12-08 23:37:32.000000000 +0200
-+++ mate-applets-1.5.0/cpufreq/src/Makefile.am 2012-12-24 23:11:26.621571494 +0200
-@@ -10,13 +10,13 @@
-       $(LIBGLADE_CFLAGS)                                      \
-       $(DBUS_CFLAGS)
- 
--libexec_PROGRAMS = cpufreq-applet
-+libexec_PROGRAMS = mate-cpufreq-applet
- 
- if HAVE_LIBCPUFREQ
- cpufreq_files=cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
- endif
- 
--cpufreq_applet_SOURCES =  \
-+mate_cpufreq_applet_SOURCES =  \
-       cpufreq-applet.c                cpufreq-applet.h                \
-       cpufreq-utils.c                 cpufreq-utils.h                 \
-       cpufreq-prefs.c                 cpufreq-prefs.h                 \
-@@ -29,7 +29,7 @@
-       $(cpufreq_files)                                                \
-       cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
- 
--cpufreq_applet_LDADD =  \
-+mate_cpufreq_applet_LDADD =  \
-       $(MATE_APPLETS4_LIBS)           \
-       $(LIBGLADE_LIBS)                \
-       $(LIBCPUFREQ_LIBS)              \