[wxmacmolplt] update to 7.5

Dominik Mierzejewski rathann at fedoraproject.org
Tue Feb 11 22:53:14 UTC 2014


commit 8778dcabea1c40a8100510f55f1ad4a135bef48a
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Feb 11 23:53:35 2014 +0100

    update to 7.5
    
    - update source URL
    - drop obsolete spec file parts
    - use upstream desktop file and icon

 .gitignore          |    1 +
 sources             |    3 +--
 wxmacmolplt.desktop |    9 ---------
 wxmacmolplt.spec    |   26 +++++++++++---------------
 4 files changed, 13 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a4179d..47dc899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /wxmacmolplt-7.4.1.tar.gz
 /MacMolPltIcon.gif
+/wxmacmolplt-7.5.tar.gz
diff --git a/sources b/sources
index cb9c4ac..2e12b7a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-efe722c0964689f94795dfad96116ea9  wxmacmolplt-7.4.4.tar.gz
-992bebfd7d430b782440985eadeca541  MacMolPltIcon.gif
+18be5c5a1c86a92b86f2cadebe1d4c93  wxmacmolplt-7.5.tar.gz
diff --git a/wxmacmolplt.spec b/wxmacmolplt.spec
index 2bbac4b..b9bb38c 100644
--- a/wxmacmolplt.spec
+++ b/wxmacmolplt.spec
@@ -1,19 +1,14 @@
 Name: wxmacmolplt
-Version: 7.4.4
-Release: 3%{?dist}
-Group: Applications/Engineering
+Version: 7.5
+Release: 1%{?dist}
 Summary: A graphics program for plotting 3-D molecular structures and normal modes
 License: GPLv2+
 URL: http://www.scl.ameslab.gov/~brett/MacMolPlt/
-Source0: http://www.scl.ameslab.gov/~brett/MacMolPlt/download/wxmacmolplt-%{version}.tar.gz
-Source1: http://www.scl.ameslab.gov/~brett/MacMolPlt/MacMolPltIcon.gif
-Source2: %{name}.desktop
-BuildRequires: %{_bindir}/convert
+Source0: http://wxmacmolplt.googlecode.com/files/wxmacmolplt-%{version}.tar.gz
 BuildRequires: desktop-file-utils
 BuildRequires: glew-devel
 BuildRequires: wxGTK-devel >= 2.6.3
 Requires: hicolor-icon-theme
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 MacMolPlt is:
@@ -34,20 +29,15 @@ MacMolPlt is:
 
 %prep
 %setup -q
-convert %{SOURCE1} wxmacmolplt.png
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-install -Dpm644 wxmacmolplt.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmacmolplt.png
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
-
-%clean
-rm -rf %{buildroot}
+install -Dpm644 resources/wxmacmolplt.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmacmolplt.png
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications resources/wxmacmolplt.desktop
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -71,6 +61,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/wxmacmolplt
 
 %changelog
+* Tue Feb 11 2014 Dominik Mierzejewski <rpm at greysector.net> 7.5-1
+- update to 7.5
+- update source URL
+- drop obsolete spec file parts
+- use upstream desktop file and icon
+
 * Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 7.4.4-3
 - rebuilt for GLEW 1.10
 


More information about the scm-commits mailing list