[gnusim8085/el6] Complete master merge
Patrick Uiterwijk
puiterwijk at fedoraproject.org
Thu Jul 19 17:27:26 UTC 2012
commit 5db133f4d223055f6066f8aaaa2a76b838657905
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date: Thu Jul 19 19:26:47 2012 +0200
Complete master merge
gnusim8085.spec | 69 ++++++++++++++++++++++++++++--------------------------
sources | 2 +-
2 files changed, 37 insertions(+), 34 deletions(-)
---
diff --git a/gnusim8085.spec b/gnusim8085.spec
index 1305076..100aa9b 100644
--- a/gnusim8085.spec
+++ b/gnusim8085.spec
@@ -1,17 +1,16 @@
-Name: gnusim8085
-Version: 1.3.6
-Release: 1%{?dist}
-Summary: A 8085 Simulator
+Name: gnusim8085
+Version: 1.3.7
+Release: 3%{?dist}
+Summary: Graphical simulator for 8085 assembly language
Group: Applications/Engineering
-License: GPLv2
-URL: http://gnusim8085.sourceforge.net
-Source0: http://launchpad.net/gnusim8085/trunk/1.3.6/+download/gnusim8085-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: GPLv2+
+URL: http://gnusim8085.org/
+Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
BuildRequires: gtksourceview2-devel
BuildRequires: desktop-file-utils
-BuildRequires: automake libtool gettext-devel
+BuildRequires: gettext-devel
Requires: electronics-menu
@@ -27,56 +26,47 @@ can be used for debugging the programs.
%prep
%setup -q
-# RHBZ = 542945
-sed -i \
- "s|share/doc/\${PACKAGE}|share/doc/%{name}-%{version}|" \
- configure.in
-sed -i "s|/usr/local/doc/GNUSim8085|%{_docdir}/%{name}-%{version}|" src/callbacks.c
-
-%{__libtoolize} --force --copy
-%{__aclocal}
-%{__automake} --add-missing
-%{__autoconf}
-
%build
-%configure
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%configure --docdir %{_datadir}/doc/%{name}-%{version}
+V=1 make %{?_smp_mflags} CFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/pixmaps/%{name}
make INSTALL="install -p" DESTDIR=%{buildroot} install
+cp -p COPYING %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
+chmod 644 %{buildroot}%{_datadir}/doc/%{name}-%{version}/COPYING
desktop-file-install --vendor "" \
--add-category "Electronics" \
--delete-original \
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/GNUSim8085.desktop
-mkdir -p %{buildroot}%{_mandir}/man1
-rm -rf %{buildroot}%{_docdir}
%find_lang %{name}
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+fi
+%posttrans
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/examples/ doc/asm-guide.txt
-%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/doc/%{name}-%{version}/
+%{_mandir}/man1/%{name}.1*
%{_bindir}/gnusim8085
%{_datadir}/applications/GNUSim8085.desktop
%{_datadir}/gnusim8085/
@@ -84,6 +74,19 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/scalable/apps/gnusim8085.svg
%changelog
+* Thu Jul 19 2012 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.3.7-3
+- Fixed comments from review
+
+* Wed Jul 18 2012 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.3.7-2
+- Revised for the review again, taken most of the patch of Michael Schwendt
+
+* Wed Jul 18 2012 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.3.7-1
+- Rebased to 1.3.7 upstream
+- Revised for re-reviewing after deprecation from previous maintainer
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Tue Mar 02 2010 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.3.6-1
- New upstream release
diff --git a/sources b/sources
index a48a747..6f156db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0ac63cff07b94a375d71c6e0502f018 gnusim8085-1.3.6.tar.gz
+6baabf2d32685a3447a6c1382589ea84 gnusim8085-1.3.7.tar.gz
More information about the scm-commits
mailing list