[mate-panel/f20: 45/45] update to 1.8.3 release

[Wolfgang Ulbrich]

commit 683310486abcf7e0b240735b0d32f83425f96912
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Oct 1 20:44:52 2014 +0200

    update to 1.8.3 release

 mate-panel.spec |   62 ++++++++++--------------------------------------------
 1 files changed, 12 insertions(+), 50 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index b119df7..b4f98bc 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -13,13 +13,8 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-panel
-<<<<<<< HEAD
-Version:        %{branch}.0
-Release:        4%{?dist}
-=======
 Version:        %{branch}.1
 Release:        1%{?dist}
->>>>>>> f21
 #Release:        0.1%{?git_rel}%{?dist}
 Summary:        MATE Desktop panel and applets
 #libs are LGPLv2+ applications GPLv2+
@@ -60,13 +55,8 @@ BuildRequires:  mate-common
 BuildRequires:  mate-desktop-devel
 BuildRequires:  mate-menus-devel
 BuildRequires:  yelp-tools
-<<<<<<< HEAD
-# koji builds complains about dconf
 BuildRequires:  dconf-devel
 
-=======
->>>>>>> f21
-
 %description
 MATE Desktop panel applets
 
@@ -86,28 +76,21 @@ Requires:    %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 Development files for mate-panel
 
-<<<<<<< HEAD
-
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 %patch0 -p1 -b .container
 
 %build
-=======
-%prep
-%setup -q%{!?rel_build:n %{name}-%{commit}}
-%patch0 -p1 -b .container
 
 # To work around rpath
 #autoreconf -fi
 
 # needed for git snapshots
-NOCONFIGURE=1 ./autogen.sh
+#NOCONFIGURE=1 ./autogen.sh
 
 %build
 
 #libexecdir needed for gnome conflicts
->>>>>>> f21
 %configure                                        \
            --disable-static                       \
            --disable-schemas-compile              \
@@ -117,14 +100,11 @@ NOCONFIGURE=1 ./autogen.sh
            --with-gtk=2.0                         \
            --enable-introspection                 \
            --enable-gtk-doc
-<<<<<<< HEAD
-=======
 
 # remove unused-direct-shlib-dependency
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 make  %{?_smp_mflags} V=1
->>>>>>> f21
 
 # remove unused-direct-shlib-dependency
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -179,11 +159,7 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.mate.panel.*.xml
 %{_datadir}/applications/mate-panel.desktop
 %{_datadir}/icons/hicolor/*/*/*
-<<<<<<< HEAD
 %{_datadir}/mate-panel/
-=======
-%{_datadir}/mate-panel
->>>>>>> f21
 %{_datadir}/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service
 %{_datadir}/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service
 %{_datadir}/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service
@@ -203,7 +179,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
-<<<<<<< HEAD
+* Wed Oct 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
+- update to 1.8.1 release
+
 * Sun Aug 10 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-4
 - fix missing fedora.layout file
 - add BR dconf-devel for fedora build server
@@ -216,29 +194,6 @@ update-desktop-database &> /dev/null || :
 - update rpm-scriptlets
 - update file section
 
-* Wed Jun 25 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-2
-- try fix rhbz (#1023604)
-
-* Sat Feb 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-1
-- update to 1.6.2 release
-- use modern 'make install' macro
-- fix rpm scriptets
-=======
-* Wed Oct 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
-- update to 1.8.1 release
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Aug 07 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0.4
-- update default panel layout
-
-* Fri Jun 25 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0.3
-- try fix rhbz (#1023604)
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
 * Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
 - Update to 1.8.0
 
@@ -283,7 +238,14 @@ update-desktop-database &> /dev/null || :
 * Fri Dec 06 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-1.1.gitd2a24b9
 - Update to 1.7.0
 - Use latest upstream git as released version fails to build with gtk2 
->>>>>>> f21
+
+* Wed Jun 25 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-2
+- try fix rhbz (#1023604)
+
+* Sat Feb 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-1
+- update to 1.6.2 release
+- use modern 'make install' macro
+- fix rpm scriptets
 
 * Thu Sep 12 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-4
 - add runtime require mate-file-manager-schemas, fix rhbz (#1007219)