Accepting request 532487 from home:jengelh:branches:Base:System

- Update package summaries. Replace old RPM constructs.
- Remove --with-pic which is useless with --disable-static.
- Edit pre_checkin.sh to remove dead python3 file.

OBS-URL: https://build.opensuse.org/request/show/532487
OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=166

file.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Oct  8 00:06:58 UTC 2017 - jengelh@inai.de
+
+- Update package summaries. Replace old RPM constructs.
+- Remove --with-pic which is useless with --disable-static.
+- Edit pre_checkin.sh to remove dead python3 file.
+
 -------------------------------------------------------------------
 Tue Sep 26 15:20:23 UTC 2017 - jmatejek@suse.com
 

file.spec

@@ -73,7 +73,7 @@ specified file. File type recognition is controlled by the file
 used by apsfilter to permit automatic printing of different file types.
 
 %package magic
-Summary:        The magic files for libmagic to use
+Summary:        Database for libmagic to help identify files
 Group:          Productivity/File utilities
 Obsoletes:      libmagic-data < %{version}
 Provides:       libmagic-data = %{version}
@@ -86,7 +86,7 @@ This package contains the basic magic files that libmagic reads and uses
 to estimate a file's type.
 
 %package -n %libname
-Summary:        Library with file's functionality
+Summary:        Library for heuristic file type identification
 Group:          System/Libraries
 Provides:       file:%{_libdir}/libmagic.so.%{somajor}
 Requires:       file-magic = %{version}
@@ -95,7 +95,7 @@ Requires:       file-magic = %{version}
 This library reads magic files and detects file types. Used by file command
 
 %package devel
-Summary:        Include Files and Libraries mandatory for Development
+Summary:        Development files for libmagic, a library to determine file types
 Group:          Development/Libraries/C and C++
 Provides:       file:/usr/include/magic.h
 Requires:       %libname = %{version}
@@ -140,9 +140,9 @@ export LC_ALL=POSIX
 rm -f Magdir/*,v Magdir/*~
 rm -f ltcf-c.sh ltconfig ltmain.sh
 autoreconf -fiv
-CFLAGS="$RPM_OPT_FLAGS -DHOWMANY=69632 -fPIE"
+export CFLAGS="%{optflags} -DHOWMANY=69632 -fPIE"
-%configure --disable-silent-rules --datadir=%{_miscdir} --disable-static --with-pic --enable-fsect-man5
+%configure --disable-silent-rules --datadir=%{_miscdir} --disable-static --enable-fsect-man5
-%{__make} %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie"
+make %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie"
 
 %install
 export LANG=POSIX
@@ -162,7 +162,7 @@ export LD_LIBRARY_PATH
 find %{buildroot}%{_bindir}/file %{_bindir}/ /%{_lib}/ %{_libdir}/ | \
 	xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic
 unset LD_LIBRARY_PATH
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
 
 %post -n %libname -p /sbin/ldconfig
 

pre_checkin.sh

@@ -2,4 +2,3 @@
 # This script is called automatically during autobuild checkin.
 version=$(grep '^Version:.*' file.spec)
 sed -ri "s,^Version:.*,$version," python-magic.spec
-sed -ri "s,^Version:.*,$version," python3-magic.spec

python-magic.spec

@@ -42,7 +42,7 @@ Provides:       python-file-magic = %{file_magic_version}
 %python_subpackages
 
 %description
-This package contains the python binding that require the magic "file"
+This package contains the Python binding that require the magic "file"
 interface.
 
 %prep