Hello community,
here is the log from the commit of package file
checked in at Tue Jan 29 01:36:00 CET 2008.
--------
--- file/file.changes 2008-01-15 10:46:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/file/file.changes 2008-01-28 18:21:06.617501000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 28 18:09:01 CET 2008 - rguenther@suse.de
+
+- Split python-magic off to separate spec file to avoid pulling
+ python into the base build cycle
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2006-09-20 18:56:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/file/python-magic.changes 2008-01-28 18:21:06.688429000 +0100
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Mon Jan 28 18:10:23 CET 2008 - rguenther@suse.de
+
+- Split off from file.
+
New:
----
python-magic.changes
python-magic.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file.spec ++++++
--- /var/tmp/diff_new_pack.T21549/_old 2008-01-29 01:35:37.000000000 +0100
+++ /var/tmp/diff_new_pack.T21549/_new 2008-01-29 01:35:37.000000000 +0100
@@ -12,15 +12,12 @@
Name: file
BuildRequires: findutils zlib-devel
-%if %suse_version > 1030
-BuildRequires: python-devel
-%endif
Url: http://www.darwinsys.com/file/
License: Other uncritical OpenSource License
Group: Productivity/File utilities
AutoReqProv: on
Version: 4.21
-Release: 25
+Release: 30
Summary: A Tool to Determine File Types
Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2
Patch: file-%{version}.dif
@@ -76,28 +73,8 @@
Mark Moraes
Christos Zoulas
-%if %suse_version > 1030
-
-%package -n python-magic
-Summary: Python module to use libmagic
-Group: Development/Languages/Python
-Requires: python = %{py_ver}
-
-%description -n python-magic
-This package contains the python binding that require the magic "file"
-interface.
-
-
-
-Authors:
---------
- Mark Moraes
- Christos Zoulas
-
-%endif
-
%prep
-%setup -q
+%setup -q -n file-%{version}
%patch1 -p0 -b .misc
%patch2 -p0 -b .pcp
%patch3 -p0 -b .exec
@@ -116,7 +93,7 @@
%ifarch mips
%patch20 -p0 -b .mips
%endif
-%if %suse_version > 1030
+%if 0%{?build_python_bindings:1}
%patch21 -p0 -b .python
%endif
%patch
@@ -134,7 +111,7 @@
./configure --prefix=%{_prefix} --datadir=%{_miscdir} --mandir=%{_mandir} \
--libdir=%{_libdir} --sysconfdir=%{_sysconfdir} --enable-fsect-man5
make pkgdatadir='$(datadir)'
-%if %suse_version > 1030
+%if 0%{?build_python_bindings:1}
pushd python
python setup.py build
popd
@@ -151,13 +128,6 @@
echo '# Localstuff: file(1) magic(5) for locally observed files' > %{buildroot}%{_sysconfdir}/magic
echo '# global magic file is %{_miscdir}/magic(.mgc)' >> %{buildroot}%{_sysconfdir}/magic
#install -s dcore %{buildroot}%{_bindir}
-%if %suse_version > 1030
-pushd python
-python setup.py install --root=%{buildroot} \
- --prefix=%{_prefix} \
- --record-rpm=../python_files
-popd
-%endif
# Check out that the binary does not bail out:
LD_LIBRARY_PATH=%{buildroot}%{_libdir}
export LD_LIBRARY_PATH
@@ -189,14 +159,11 @@
%{_libdir}/lib*.so
%{_includedir}/magic.h
%attr(644,root,root) %{_mandir}/man3/libmagic.3.gz
-%if %suse_version > 1030
-
-%files -n python-magic -f python_files
-%defattr(-,root,root)
-%doc python/README python/example.py
-%endif
%changelog
+* Mon Jan 28 2008 rguenther@suse.de
+- Split python-magic off to separate spec file to avoid pulling
+ python into the base build cycle
* Tue Jan 15 2008 werner@suse.de
- Move python-base to python
* Wed Dec 05 2007 werner@suse.de
@@ -224,7 +191,7 @@
- Add zlib-devel BuildRequires
* Wed Mar 21 2007 werner@suse.de
- Update to file 4.20 due security reason CVE-2007-1536 (#256290)
-* Tue Mar 06 2007 rguenther@suse.de
+* Wed Mar 07 2007 rguenther@suse.de
- Fix order of changelog entries
* Thu Nov 23 2006 werner@suse.de
- Initialize variable in elf patch
@@ -319,7 +286,7 @@
- removed bogus self-provides
* Tue Jul 23 2002 werner@suse.de
- Add mySQL bytes to magic (bug #16138)
-* Fri Jun 07 2002 olh@suse.de
+* Sat Jun 08 2002 olh@suse.de
- don't change the union u in readelf.c:tryelf() on ppc64
* Mon Feb 04 2002 werner@suse.de
- Fix looking of manual page
@@ -382,7 +349,7 @@
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Aug 24 1999 uli@suse.de
- added -fsigned-char to CFLAGS (PPC)
-* Wed Nov 04 1998 ro@suse.de
+* Thu Nov 05 1998 ro@suse.de
- disabled dcore (won't build with glibc-2.0)
* Thu Oct 01 1998 ro@suse.de
- update to 3.26
++++++ python-magic.spec ++++++
#
# spec file for package python-magic (Version 4.21)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: python-magic
%define build_python_bindings 1
BuildRequires: findutils zlib-devel
BuildRequires: python-devel
Url: http://www.darwinsys.com/file/
License: Other uncritical OpenSource License
Group: Development/Languages/Python
AutoReqProv: on
Version: 4.21
Release: 30
Summary: Python module to use libmagic
%py_requires
Source99: file.spec
%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/file.spec)}
%global _sysconfdir /etc
%global _miscdir %{_datadir}/misc
%description
This package contains the python binding that require the magic "file"
interface.
Authors:
--------
Mark Moraes
Christos Zoulas
%prep
%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/file.spec | sed -e '1d' -e '$d')}
%install
pushd python
python setup.py install --root=%{buildroot} \
--prefix=%{_prefix} \
--record-rpm=../python_files
popd
%files -f python_files
%defattr(-,root,root)
%doc python/README python/example.py
%changelog
* Mon Jan 28 2008 rguenther@suse.de
- Split off from file.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org