Packaging: clean spec files

* Remove "%changelog".
* Remove buildroot definition.
* Add "noarch" to non architecture dependent packages.
* Remove definition of rpm macro "%{_sysconfdir}.
* Replace tabulations with spaces.
* Set valid group tags.

Change-Id: I510c95f52ba4a298a63c36ebf8758c060d4e34fa
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/packaging/file.spec b/packaging/file.spec
index ade5f03..8ddd7bc 100644 (file)
--- a/packaging/file.spec
+++ b/packaging/file.spec
@@ -1,3 +1,5 @@
+%global         _miscdir    %{_datadir}/misc
+
 Name:           file
 BuildRequires:  findutils
 BuildRequires:  libtool
@@ -7,16 +9,13 @@ Version:        5.18
 Release:        0
 Summary:        A Tool to Determine File Types
 License:        BSD-2-Clause
-Group:          System/Base
+Group:          System/Utilities
 
 ### SOURCES BEGIN ###
 Source2:        baselibs.conf
-Source1001:    file.manifest
+Source1001:     file.manifest
 ### SOURCES END ###
 Source:         ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
-%global         _sysconfdir /etc
-%global         _miscdir    %{_datadir}/misc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 With the file command, you can obtain information on the file type of a
@@ -36,15 +35,15 @@ to estimate a file's type.
 Summary:        Library with file's functionality
 Group:          System/Libraries
 Requires:       libmagic-data = %{version}
-Provides:      libfile
-Obsoletes:     libfile =< 5.04
+Provides:       libfile
+Obsoletes:      libfile =< 5.04
 
 %description -n libmagic
 This library reads magic files and detects file types. Used by file command
 
-%package     -n file-devel
+%package -n file-devel
 Summary:        Include Files and Libraries mandatory for Development
-Group:          Development/Libraries
+Group:          System/Libraries
 Provides:       file:/usr/include/magic.h
 Requires:       glibc-devel
 Requires:       libmagic = %{version}
@@ -79,17 +78,17 @@ popd
 %install
 export LANG=POSIX
 export LC_ALL=POSIX
-mkdir  %{buildroot}/etc
+mkdir  %{buildroot}%{_sysconfdir}
 make DESTDIR=%{buildroot} install pkgdatadir='$(datadir)'
 rm -vf %{buildroot}%{_sysconfdir}/magic
 echo '# Localstuff: file(1) magic(5) for locally observed files' > %{buildroot}%{_sysconfdir}/magic
-echo '#     global magic file is %{_miscdir}/magic(.mgc)'      >> %{buildroot}%{_sysconfdir}/magic
+echo '#     global magic file is %{_miscdir}/magic(.mgc)'   >> %{buildroot}%{_sysconfdir}/magic
 %{nil install -s dcore %{buildroot}%{_bindir}}
 # Check out that the binary does not bail out:
 LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 export LD_LIBRARY_PATH
 find %{buildroot}%{_bindir}/file %{_bindir}/ /%{_lib}/ %{_libdir}/ | \
-       xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic
+    xargs %{buildroot}%{_bindir}/file -m %{buildroot}%{_miscdir}/magic
 unset LD_LIBRARY_PATH
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 
@@ -107,7 +106,7 @@ unset LD_LIBRARY_PATH
 %manifest %{name}.manifest
 %defattr (644,root,root,755)
 %config(noreplace) %{_sysconfdir}/magic
-#%{_miscdir}/magic
+#%%{_miscdir}/magic
 %{_miscdir}/magic.mgc
 %doc %{_mandir}/man5/magic.5.gz
 
@@ -126,5 +125,3 @@ unset LD_LIBRARY_PATH
 %{_includedir}/magic.h
 %doc %{_mandir}/man3/libmagic.3.gz
 %license COPYING
-
-%changelog

diff --git a/packaging/python-magic.spec b/packaging/python-magic.spec
index 260dd15..0f7c422 100644 (file)
--- a/packaging/python-magic.spec
+++ b/packaging/python-magic.spec
@@ -1,5 +1,7 @@
-Name:           python-magic
 %define build_python_bindings 1
+%global         _miscdir    %{_datadir}/misc
+
+Name:           python-magic
 BuildRequires:  findutils
 BuildRequires:  libtool
 BuildRequires:  python-devel
@@ -9,16 +11,13 @@ Version:        5.18
 Release:        0
 Summary:        Python module to use libmagic
 License:        BSD-3-Clause and BSD-4-Clause
-Group:          Development/Languages/Python
+Group:          Platform Development/Python
 Source99:       file.spec
+BuildArch:      noarch
 
 %{expand:%(sed -n -e '/^### SOURCES BEGIN ###/,/^### SOURCES END ###/p' <%_sourcedir/file.spec)}
 Source:         ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 
-%global         _miscdir    %{_datadir}/misc
-%global         _sysconfdir /etc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %description 
 This package contains the python binding that require the magic "file"
 interface.
@@ -33,12 +32,11 @@ interface.
 
 %install
 pushd python
-python setup.py install --root=%{buildroot}    \
-                       --prefix=%{_prefix}     \
-                       --record-rpm=../python_files
+python setup.py install --root=%{buildroot} \
+                        --prefix=%{_prefix} \
+                        --record-rpm=../python_files
 popd
 
 %files -f python_files
 %defattr(-,root,root)
 
-%changelog