kevin pushed to orage (master). "Update to 4.12.1"

[notifications at fedoraproject.org]

>From b98fad09c3dd25510dc1d5dd8eda2c85f58dcbb7 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin at scrye.com>
Date: Fri, 10 Apr 2015 12:16:43 -0600
Subject: Update to 4.12.1


diff --git a/.gitignore b/.gitignore
index 0e84111..6758d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ orage-4.6.1.tar.bz2
 /orage-4.8.3.tar.bz2
 /orage-4.8.4.tar.bz2
 /orage-4.10.0.tar.bz2
+/orage-4.12.1.tar.bz2
diff --git a/orage-4.6.1-dsofix.patch b/orage-4.6.1-dsofix.patch
deleted file mode 100644
index f5a2216..0000000
--- a/orage-4.6.1-dsofix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur orage-4.6.1.orig/globaltime/Makefile.in orage-4.6.1/globaltime/Makefile.in
---- orage-4.6.1.orig/globaltime/Makefile.in	2009-04-14 16:59:40.000000000 -0600
-+++ orage-4.6.1/globaltime/Makefile.in	2010-02-14 00:39:38.000000000 -0700
-@@ -145,7 +145,7 @@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-diff -Nur orage-4.6.1.orig/panel-plugin/Makefile.in orage-4.6.1/panel-plugin/Makefile.in
---- orage-4.6.1.orig/panel-plugin/Makefile.in	2009-04-14 16:59:44.000000000 -0600
-+++ orage-4.6.1/panel-plugin/Makefile.in	2010-02-14 00:18:49.000000000 -0700
-@@ -154,7 +154,7 @@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-diff -Nur orage-4.6.1.orig/src/Makefile.in orage-4.6.1/src/Makefile.in
---- orage-4.6.1.orig/src/Makefile.in	2009-04-14 16:59:45.000000000 -0600
-+++ orage-4.6.1/src/Makefile.in	2010-02-13 23:57:08.000000000 -0700
-@@ -186,7 +186,7 @@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11 -lm
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
diff --git a/orage.spec b/orage.spec
index ab00336..8b20d0f 100644
--- a/orage.spec
+++ b/orage.spec
@@ -1,8 +1,8 @@
 %global xfceversion 4.12
 
 Name:           orage
-Version:        4.10.0
-Release:        6%{?dist}
+Version:        4.12.1
+Release:        1%{?dist}
 Summary:        Time-managing application for Xfce4
 
 Group:          User Interface/Desktops
@@ -72,6 +72,9 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/globaltime.appdata.xml <<EOF
 </component>
 EOF
 
+# remove unneeded .la file
+rm -f %{buildroot}%{_libdir}/xfce4/panel/plugins/liborageclock.la
+
 %clean
 rm -rf %{buildroot}
 
@@ -100,16 +103,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
 %{_datadir}/orage/
-%{_libexecdir}/xfce4/panel-plugins/xfce4-orageclock-plugin
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
 %{_datadir}/dbus-1/services/org.xfce.calendar.service
 %{_datadir}/dbus-1/services/org.xfce.orage.service
+%{_datadir}/xfce4/panel/plugins/xfce4-orageclock-plugin.desktop
+%{_libdir}/xfce4/panel/plugins/liborageclock.so
 %{_mandir}/man1/globaltime.1.*
 %{_mandir}/man1/orage.1.*
 %{_mandir}/man1/tz_convert.1.*
 
 %changelog
+* Fri Apr 10 2015 Kevin Fenzi <kevin at scrye.com> 4.12.1-1
+- Update to 4.12.1
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.10.0-6
 - Add an AppData file for the software center
 
@@ -184,7 +190,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.0-2 
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 
 
-* Tue Jan 13 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.0-1
+* Thu Jan 13 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.0-1
 - Update to 4.8.0
 
 * Sun Jan 09 2011 Kevin Fenzi <kevin at tummy.com> - 4.7.6.13-1
diff --git a/sources b/sources
index 7377f6c..74f2f2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b33fa272d92f539a224a7a40b1926dfc  orage-4.10.0.tar.bz2
+2b7f5d38cb5c6edbcc65d0f52a742e46  orage-4.12.1.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/orage.git/commit/?h=master&id=b98fad09c3dd25510dc1d5dd8eda2c85f58dcbb7