[qelectrotech/epel7] update to 0.4

[Remi Collet]

commit 89d0d95c777a5747c1e18370a98f435fe4187de9
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Feb 20 17:15:35 2015 +0100

    update to 0.4
    
    (cherry picked from commit cf118ba4268293c7adddbd4d512ee4acf73fd425)

 .gitignore        |  1 +
 qelectrotech.spec | 47 ++++++++++++++++++++++++++---------------------
 sources           |  2 +-
 3 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f4ba47..3243328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ qelectrotech-0.22-src.tar.gz
 /qelectrotech-0.3b-src.tar.gz
 /qelectrotech-0.3rc-src.tar.gz
 /qelectrotech-0.3-src.tar.gz
+/qelectrotech-0.4-src.tar.gz
diff --git a/qelectrotech.spec b/qelectrotech.spec
index 6e5813e..23ce3ac 100644
--- a/qelectrotech.spec
+++ b/qelectrotech.spec
@@ -1,6 +1,13 @@
-#global svnrel 2287
-%global rdate  20130928
-%global upver  0.3
+# spec file for qelectrotech
+#
+# Copyright (c) 2009-2015 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+%global rdate  20150220
+%global upver  0.4
 
 Name:        qelectrotech
 
@@ -21,7 +28,7 @@ Summary(ru): Редактор электрических схем
 # Upstream version is a float so 0.11 < 0.2 < 0.21 < 0.3
 # So use %.2f with upstream acknowledgment
 # Remember to check rdate and upver macro on each update
-Version:     0.30
+Version:     0.40
 Release:     1%{?dist}
 
 Group:       Applications/Engineering
@@ -30,18 +37,10 @@ Group:       Applications/Engineering
 License:    GPLv2+
 
 Url:        http://qelectrotech.org/
-%if 0%{?svnrel}
-# svn export -r 2287 svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-0.3a-svn2287
-# tar czf qelectrotech-0.3a-svn2287.tgz qelectrotech-0.3a-svn2287
-Source0:    qelectrotech-%{upver}-svn%{?svnrel}.tgz
-%else
 Source0:    http://download.tuxfamily.org/qet/tags/%{rdate}/qelectrotech-%{upver}-src.tar.gz
-%endif
 
 BuildRequires:    desktop-file-utils
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
-BuildRequires:    qt4-devel >= 4.6.0
+BuildRequires:    qt4-devel >= 4.8
 Requires:         qelectrotech-symbols = %{version}-%{release}
 Requires:         electronics-menu
 
@@ -137,11 +136,7 @@ Colecção de elementos para QElectroTech.
 
 
 %prep
-%if 0%{?svnrel}
-%setup -q -n %{name}-%{upver}-svn%{svnrel}
-%else
 %setup -q -n %{name}-%{upver}-src
-%endif
 
 sed -e s,/usr/local/,%{_prefix}/, \
     -e /QET_MAN_PATH/s,'man/','share/man', \
@@ -182,23 +177,28 @@ cat qet.lang >>qelectrotech.lang
 
 %post
 /usr/bin/update-desktop-database &>/dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
 /bin/touch --no-create %{_datadir}/icons/hicolor
+/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
 /usr/bin/update-desktop-database &>/dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+    /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+    /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
 
+%{!?_licensedir:%global license %%doc}
 
 %files -f %{name}.lang
-%doc CREDIT LICENSE examples
+%doc CREDIT examples
+%license LICENSE
 %{_bindir}/%{name}
 %if 0%{?fedora} < 20
 %exclude %{_datadir}/appdata/%{name}.appdata.xml
@@ -216,12 +216,17 @@ fi
 
 
 %files symbols
-%doc ELEMENTS.LICENSE
+%license ELEMENTS.LICENSE
 %{_datadir}/%{name}/elements
 %{_datadir}/%{name}/titleblocks
 
 
 %changelog
+* Fri Feb 20 2015 Remi Collet <remi at fedoraproject.org> - 0.40-1
+- Version 0.4 finale
+- fix license handling
+- update mime scriptlets, drop extraneous scriptlet deps
+
 * Sat Sep 28 2013 Remi Collet <remi at fedoraproject.org> - 0.30-1
 - Version 0.3 finale
 
diff --git a/sources b/sources
index 46f37fe..a9b84e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a7b9b01dcde4b7fcb814ec621d037ad  qelectrotech-0.3-src.tar.gz
+3699e5718e0adc361511513c9f1f7ea1  qelectrotech-0.4-src.tar.gz