[magic] 8.0.174

Peter Robinson pbrobinson at fedoraproject.org
Tue Jul 8 17:08:47 UTC 2014 

commit 5cb61570bff1296f549dcbfe376dc13518f8e82c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jul 8 18:08:56 2014 +0100

    8.0.174

 .gitignore |    2 +-
 magic.spec |   99 ++++++++++--------------------------------------------------
 sources    |    2 +-
 3 files changed, 18 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93180f7..d3f7e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-magic-8.0.60.tgz
+magic-8.0.*.tgz
diff --git a/magic.spec b/magic.spec
index 2891e6b..126d6e2 100644
--- a/magic.spec
+++ b/magic.spec
@@ -1,6 +1,6 @@
 Name:             magic
-Version:          8.0.60
-Release:          9%{?dist}
+Version:          8.0.174
+Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
 License:          GPLv2
@@ -14,8 +14,6 @@ Patch0:           %{name}-verbose.patch
 Patch1:           %{name}-7.4.35-64bit.patch
 Patch2:           %{name}-8.0.60-format-security.patch
 
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:    libXi-devel libXmu-devel libXext-devel mesa-libGLU-devel blt tcsh
 BuildRequires:    desktop-file-utils tk-devel mesa-libGLw-devel mesa-libGL-devel m4
 
@@ -49,19 +47,17 @@ and some tutorials.
 
 
 cd %{name}-%{version}
-%{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
+sed -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
 sed -i "s|/usr/local/bin/tclsh|%{_bindir}/tclsh|" tcltk/strip_reflibs.tcl
 sed -i "s|package require -exact|package require|" tcltk/tkcon.tcl
 
 %patch0 -p0 -b .verbose
 
-%ifarch x86_64 sparc64 ppc64 amd64 aarch64
+%if %{__isa_bits} == 64
 %patch1 -p0 -b .64bit
 %endif
 
-%patch2 -p1 -b .formatsec
-
 %build
 
 export WISH=%{_bindir}/wish
@@ -74,11 +70,11 @@ cd %{name}-%{version}
    --with-tcllibs=%{_libdir} \
    --with-tklibs=%{_libdir}
 
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 cd %{name}-%{version}
-%{__make} install                \
+make install                \
     DESTDIR=%{buildroot}         \
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
@@ -88,17 +84,17 @@ desktop-file-install --vendor ""                \
     %{SOURCE1}
 
 # applying timestamps
-%{__cp} -pr README* TODO VERSION scmos/ ..
+cp -pr README* TODO VERSION scmos/ ..
 
-%{__cp} -pr %{buildroot}%{_libdir}/%{name}/{doc/,tutorial} ..
-%{__rm} -rf %{buildroot}%{_libdir}/%{name}/{doc/,tutorial}
+cp -pr %{buildroot}%{_libdir}/%{name}/{doc/,tutorial} ..
+rm -rf %{buildroot}%{_libdir}/%{name}/{doc/,tutorial}
 
-%{__rm} -f doc/html/Makefile
+rm -f doc/html/Makefile
 
 chmod -x %{buildroot}%{_libdir}/%{name}/tcl/console.tcl
 
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
-%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
+cp -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 
 %post
@@ -115,7 +111,6 @@ update-desktop-database &> /dev/null || :
 %files
 %doc README* TODO VERSION
 %{_bindir}/%{name}
-%{_bindir}/spice2sim
 %{_bindir}/ext2sim
 %{_bindir}/ext2spice
 %{_libdir}/%{name}/
@@ -128,6 +123,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Tue Jul  8 2014 Peter Robinson <pbrobinson at fedoraproject.org> 8.0.174-1
+- 8.0.174 
+- Generic 64bit platform detection
+
 * Wed Jun 18 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 8.0.60-9
 - Fix FTBFS with -Werror=format-security (#1037190, #1106151)
 - Apply 64bit patch on aarch64
@@ -150,69 +149,3 @@ update-desktop-database &> /dev/null || :
 
 * Wed Jan 07 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.169-1
 - new upstream release
-
-* Thu Dec 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.168-1
-- new upstream release
-
-* Thu Aug 28 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.147-1
-- new upstream release
-
-* Fri Aug 15 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.146-1
-- new upstream release
-
-* Mon May 26 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.140-1
-- new upstream release
-
-* Mon Apr 28 2008 Aanjhan Ranganathan <tuxmaniac [AT] fedoraproject DOT org> - 7.5.129-3
-- Build error resolved.
-
-* Sun Apr 27 2008 Aanjhan Ranganathan <tuxmaniac [AT] fedoraproject DOT org> - 7.5.129-2
-- Fixed appearance on the menu, popular demand
-
-* Sun Apr 08 2008 Thibault North <tnorth [AT] fedoraproject DOT org>  -  7.5.129-1
-- new upstream release
-- opting the FEL relating menu structure
-- Fixed compilation for current Tk version
-
-* Fri Feb 08 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.116-1
-- new upstream release
-
-* Fri Aug 24 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-6
-- mass rebuild for fedora 8 - ppc
-
-* Sun Jul 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-5
-- patching properly
-
-* Sun Jul 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-4
-- patching properly
-
-* Sun Jul 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-3
-- fix for 64 bit with respect to a hardcoded autopath
-- fix for %%post and %%postun - #246778
-
-* Thu Jun 21 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-2
-- fix desktop file #241443
-
-* Wed Feb 22 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-1
-- New upstream release
-- added mimetype
-
-* Wed Feb 22 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-6
-- Fixed shebang
-
-* Mon Feb 05 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-5
-- fixed documentation locations
-
-* Sat Feb 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-4
-- CFLAGS fix improved
-- tarball includes unneeded symlink, firstly create a directory and expand tarball there.
-- added timestamps support
-
-* Thu Feb 01 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-3
-- fix for CFLAGS
-
-* Sat Jan 20 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-2
-- Fix presence of magic in gnome menu
-
-* Fri Jan 19 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-1
-- Initial package for Fedora Extras.
diff --git a/sources b/sources
index f4ab023..2af0e32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ee7da3137ab70bab1ca485e489c67db  magic-8.0.60.tgz
+7beb1630096ba40bae4d763c17439871  magic-8.0.174.tgz

More information about the scm-commits mailing list