commit deb for openSUSE:Factory
Hello community, here is the log from the commit of package deb for openSUSE:Factory checked in at 2012-06-06 10:27:53 Comparing /work/SRC/openSUSE:Factory/deb (Old) and /work/SRC/openSUSE:Factory/.deb.new (New) Package is deb, Maintainer is vdziewie...@suse.com Changes: --- /work/SRC/openSUSE:Factory/deb/update-alternatives.changes 2012-06-05 15:30:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives.changes 2012-06-06 10:27:54.0 +0200 @@ -1,0 +2,5 @@ +Wed Jun 6 08:22:03 UTC 2012 - co...@suse.com + +- fix the reworked patch + +--- Other differences: -- update-alternatives.spec: same change ++ dpkg-archtable-suse.patch ++ --- /var/tmp/diff_new_pack.Qd9V8c/_old 2012-06-06 10:28:01.0 +0200 +++ /var/tmp/diff_new_pack.Qd9V8c/_new 2012-06-06 10:28:01.0 +0200 @@ -1,7 +1,8 @@ -diff -urN dpkg-1.16.3.orig/debian/archtable dpkg-1.16.3/debian/archtable dpkg-1.16.3.orig/debian/archtable 2012-05-21 11:10:20.604419618 +0800 -+++ dpkg-1.16.3/debian/archtable 2012-05-21 11:27:16.525718853 +0800 -@@ -27,3 +27,15 @@ +Index: dpkg-1.16.3/debian/archtable +=== +--- dpkg-1.16.3.orig/debian/archtable 2012-04-27 04:49:02.0 +0200 dpkg-1.16.3/debian/archtable 2012-06-06 10:22:46.728432824 +0200 +@@ -27,3 +27,15 @@ sparc-linux-gnu sparc i486-gnu hurd-i386 i486-kfreebsd-gnu kfreebsd-i386 x86_64-kfreebsd-gnu kfreebsd-amd64 @@ -17,4 +18,4 @@ ++powerpc-suse-linux powerpc ++s390-suse-linux s390 ++sparc-suse-linux sparc -\ 文件尾没有 newline 字符 +\ No newline at end of file ++ update-alternatives-1.16.3-suse.patch ++ --- /var/tmp/diff_new_pack.Qd9V8c/_old 2012-06-06 10:28:01.0 +0200 +++ /var/tmp/diff_new_pack.Qd9V8c/_new 2012-06-06 10:28:01.0 +0200 @@ -72,7 +72,7 @@ printf(\n); printf(_( -@@ -359,13 +359,13 @@ +@@ -359,7 +359,7 @@ const char *basedir, *dpkg_basedir; char *admindir; @@ -81,10 +81,3 @@ if (dpkg_basedir) basedir = dpkg_basedir; else - basedir = ADMINDIR; - -- xasprintf(admindir, %s/%s, basedir, alternatives); -+ xasprintf(admindir, %s/%s, basedir, /var/lib/rpm/alternatives); - - return admindir; - } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory checked in
at 2012-06-05 15:30:11
Comparing /work/SRC/openSUSE:Factory/deb (Old)
and /work/SRC/openSUSE:Factory/.deb.new (New)
Package is deb, Maintainer is vdziewie...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/deb/deb.changes 2012-05-14 16:13:29.0
+0200
+++ /work/SRC/openSUSE:Factory/.deb.new/deb.changes 2012-06-05
15:30:15.0 +0200
@@ -1,0 +2,16 @@
+Mon May 21 03:31:50 UTC 2012 - i...@marguerite.su
+
+- update to dpkg-1.16.3
+ * see
http://packages.debian.org/changelogs/pool/main/d/dpkg/dpkg_1.16.3/changelog
+- update to debhelper 9.20120518
+ * Fix versioned dependency on dpkg for xz options. Closes: #672895
+ * dh_link: Doc improvement. Closes: #672988
+- update to devscripts-2.11.7
+ * see
http://packages.debian.org/changelogs/pool/main/d/devscripts/devscripts_2.11.7/changelog
+- reworked patch. remove version for archtable. for it's universal.
+- add dh_make 0.60
+ * see
http://packages.debian.org/changelogs/pool/main/d/dh-make/dh-make_0.60/changelog
+- add dh_autoreconf 6
+ * see
http://packages.debian.org/changelogs/pool/main/d/dh-autoreconf/dh-autoreconf_6/changelog
+
+---
--- /work/SRC/openSUSE:Factory/deb/update-alternatives.changes 2012-01-31
10:20:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives.changes
2012-06-05 15:30:15.0 +0200
@@ -1,0 +2,6 @@
+Mon May 21 03:34:58 UTC 2012 - i...@marguerite.su
+
+- update to 1.16.3
+- reworked patch
+
+---
Old:
debhelper_8.1.2.tar.gz
devscripts-2.10.71-buildfix.patch
devscripts-2.10.71-debcommit-hg16.patch
devscripts_2.10.71.tar.gz
dpkg-1.15.8.12-archtable-suse.patch
dpkg_1.15.8.12.tar.bz2
update-alternatives-1.15.8.12-suse.patch
New:
debhelper_9.20120518.tar.gz
devscripts-2.11.7-buildfix.patch
devscripts-2.11.7-debcommit-hg16.patch
devscripts-2.11.7-remove-install-layout-deb.patch
devscripts_2.11.7.tar.gz
dh-autoreconf_6.tar.gz
dh-make_0.60.tar.gz
dpkg-archtable-suse.patch
dpkg_1.16.3.tar.bz2
update-alternatives-1.16.3-suse.patch
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.VY4pu1/_old 2012-06-05 15:30:18.0 +0200
+++ /var/tmp/diff_new_pack.VY4pu1/_new 2012-06-05 15:30:18.0 +0200
@@ -17,49 +17,70 @@
%define admindir %{_localstatedir}/lib/rpm/
-%define debhelper_ver 8.1.2
-%define devscripts_ver 2.10.71
+%define debhelper_ver 9.20120518
+%define devscripts_ver 2.11.7
+%define dhmake_ver 0.60
+%define dhautoreconf_ver 6
+
+%{!?py_ver: %global py_ver %(echo `python -c import sys;
sys.stdout.write(sys.version[:3])`)}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib()))}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib(1)))}
Name: deb
-Version:1.15.8.12
+Version:1.16.3
Release:0
-Url:http://www.debian.org
-Provides: debhelper
-Provides: devscripts
-Provides: dpkg
-Provides: dpkg-dev
-Provides: dpkg-doc
-Provides: dselect
-Requires: cpio
-Requires: html2text
-Requires: make
-Requires: patch
-Requires: perl = %{perl_version}
Summary:Tools for Debian Packages
License:GPL-2.0+
Group: System/Packages
+Url:http://www.debian.org
Source0:
http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2
Source1:
http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_%{debhelper_ver}.tar.gz
Source2:
http://ftp.de.debian.org/debian/pool/main/d/devscripts/devscripts_%{devscripts_ver}.tar.gz
Source3:sensible-editor
+Source4:
http://ftp.de.debian.org/debian/pool/main/d/dh-make/dh-make_%{dhmake_ver}.tar.gz
+Source5:
http://ftp.de.debian.org/debian/pool/main/d/dh-autoreconf/dh-autoreconf_%{dhautoreconf_ver}.tar.gz
+# PATCH-FIX-UPSTREAM not build translated-manpages.
Patch0: debhelper-no-localized-manpages.patch
-Patch1: devscripts-2.10.71-buildfix.patch
+# PATCH-FIX-UPSTREAM remove bash auto completion and fix docbook template
directories path.
+Patch1: devscripts-2.11.7-buildfix.patch
+# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
Patch2: debhelper-pod2man-no-utf8.patch
-Patch3: devscripts-2.10.71-debcommit-hg16.patch
+# PATCH-FIX-UPSTREAM hg can't commit empty, fix it.
+Patch3:
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory checked in
at 2012-05-14 16:13:25
Comparing /work/SRC/openSUSE:Factory/deb (Old)
and /work/SRC/openSUSE:Factory/.deb.new (New)
Package is deb, Maintainer is vdziewie...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/deb/deb.changes 2012-01-31 10:20:31.0
+0100
+++ /work/SRC/openSUSE:Factory/.deb.new/deb.changes 2012-05-14
16:13:29.0 +0200
@@ -1,0 +2,7 @@
+Thu May 3 20:23:11 UTC 2012 - frank.lichtenh...@sophos.com
+
+- install missing parts of devscripts
+* install man pages installed by debian/manpages
+* install symlinks installed by debian/links
+
+---
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.3ZHHe8/_old 2012-05-14 16:13:31.0 +0200
+++ /var/tmp/diff_new_pack.3ZHHe8/_new 2012-05-14 16:13:31.0 +0200
@@ -24,9 +24,17 @@
Version:1.15.8.12
Release:0
Url:http://www.debian.org
-Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
+Provides: debhelper
+Provides: devscripts
+Provides: dpkg
+Provides: dpkg-dev
+Provides: dpkg-doc
+Provides: dselect
+Requires: cpio
+Requires: html2text
+Requires: make
+Requires: patch
Requires: perl = %{perl_version}
-Requires: cpio patch make html2text
Summary:Tools for Debian Packages
License:GPL-2.0+
Group: System/Packages
@@ -48,8 +56,8 @@
%if 0%{?suse_version} 1010
BuildRequires: fdupes
%endif
-BuildRequires: libxslt
BuildRequires: docbook-xsl-stylesheets
+BuildRequires: libxslt
Requires(pre): /bin/touch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -232,6 +240,13 @@
pushd ../devscripts-%{devscripts_ver}
make install DESTDIR=%{buildroot}
+install -D -m 644 scripts/*.1 %{buildroot}%{_mandir}/man1/
+install -D -m 644 scripts/*.5 %{buildroot}%{_mandir}/man5/
+while read target link; do
+ if [ -d $(dirname %{buildroot}$link) ]; then
+ln -sf $target %{buildroot}$link
+ fi
+done debian/links
popd
# extras
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory checked in
at 2012-01-31 10:19:36
Comparing /work/SRC/openSUSE:Factory/deb (Old)
and /work/SRC/openSUSE:Factory/.deb.new (New)
Package is deb, Maintainer is pu...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/deb/deb.changes 2012-01-04 07:23:45.0
+0100
+++ /work/SRC/openSUSE:Factory/.deb.new/deb.changes 2012-01-31
10:20:31.0 +0100
@@ -1,0 +2,13 @@
+Sun Jan 29 20:54:50 UTC 2012 - frank.lichtenh...@sophos.com
+
+- update to dpkg-1.15.8.12
+* Do not fail to unpack shared directories missing on the file system
+ from packages being replaced by other packages. Debian Bug #631808
+* Defer hardlink renames so that there's never a point were the new
+ file contents are accessible from the final path before they have
+ been fsync()ed and cannot be executed causing ETXTBSY when trying
+ to open the to be installed paths for writing. Debian Bug #635683
+* Add armhf support to ostable and triplettable.
+ Debian Bugs #594179, #639674
+
+---
@@ -4,0 +18,12 @@
+
+---
+Sat Nov 26 00:18:57 UTC 2011 - frank.lichtenh...@sophos.com
+
+- update to dpkg-1.15.8.11
+* Do not segfault on dpkg -i --no-act.
+* Fix typo in dpkg-name --overwrite argument parsing so that it actually
+ works at all. Ubuntu Bug #728708
+* Fix dpkg-split to not corrupt binary part metadata when generating the
+ split packages on 32-bit systems.
+* Fix a regression in dpkg-divert where using --rename led to a failure when
+ the rename implies crossing file systems.
--- /work/SRC/openSUSE:Factory/deb/update-alternatives.changes 2011-09-23
01:54:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.deb.new/update-alternatives.changes
2012-01-31 10:20:31.0 +0100
@@ -1,0 +2,12 @@
+Sun Jan 29 21:29:58 UTC 2012 - frank.lichtenh...@sophos.com
+
+- update to 1.15.8.12
+* no changes, just keep in sync with deb
+
+---
+Sat Nov 26 00:24:49 UTC 2011 - frank.lichtenh...@sophos.com
+
+- update to 1.15.8.11
+- remove unused tarballs and patches
+
+---
Old:
dpkg-1.15.8.10-archtable-suse.patch
dpkg_1.15.8.10.tar.bz2
update-alternatives-1.15.8.10-suse.patch
New:
dpkg-1.15.8.12-archtable-suse.patch
dpkg_1.15.8.12.tar.bz2
update-alternatives-1.15.8.12-suse.patch
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.JXPA4i/_old 2012-01-31 10:20:35.0 +0100
+++ /var/tmp/diff_new_pack.JXPA4i/_new 2012-01-31 10:20:35.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package deb
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define admindir %{_localstatedir}/lib/rpm/
%define debhelper_ver 8.1.2
%define devscripts_ver 2.10.71
Name: deb
-Version:1.15.8.10
+Version:1.15.8.12
Release:0
Url:http://www.debian.org
Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
@@ -37,8 +38,8 @@
Patch1: devscripts-2.10.71-buildfix.patch
Patch2: debhelper-pod2man-no-utf8.patch
Patch3: devscripts-2.10.71-debcommit-hg16.patch
-Patch4: update-alternatives-1.15.8.10-suse.patch
-Patch5: dpkg-1.15.8.10-archtable-suse.patch
+Patch4: update-alternatives-%{version}-suse.patch
+Patch5: dpkg-%{version}-archtable-suse.patch
Patch6: dpkg-pod2man-no-utf8.patch
Patch7: devscripts-pod2man-no-utf8.patch
BuildRequires: gcc-c++
++ update-alternatives.spec ++
--- /var/tmp/diff_new_pack.JXPA4i/_old 2012-01-31 10:20:35.0 +0100
+++ /var/tmp/diff_new_pack.JXPA4i/_new 2012-01-31 10:20:35.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package update-alternatives
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,27 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define admindir %{_localstatedir}/lib/rpm/
-%define debhelper_ver 8.1.2
-%define devscripts_ver
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory checked in
at 2012-01-04 07:23:44
Comparing /work/SRC/openSUSE:Factory/deb (Old)
and /work/SRC/openSUSE:Factory/.deb.new (New)
Package is deb, Maintainer is pu...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/deb/deb.changes 2011-09-23 01:54:56.0
+0200
+++ /work/SRC/openSUSE:Factory/.deb.new/deb.changes 2012-01-04
07:23:45.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec 20 20:15:25 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.mwcdUA/_old 2012-01-04 07:23:47.0 +0100
+++ /var/tmp/diff_new_pack.mwcdUA/_new 2012-01-04 07:23:47.0 +0100
@@ -15,21 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define admindir %{_localstatedir}/lib/rpm/
%define debhelper_ver 8.1.2
%define devscripts_ver 2.10.71
Name: deb
Version:1.15.8.10
-Release:3
+Release:0
Url:http://www.debian.org
-License:GPL-2.0+
-Group: System/Packages
Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
Requires: perl = %{perl_version}
Requires: cpio patch make html2text
Summary:Tools for Debian Packages
+License:GPL-2.0+
+Group: System/Packages
Source0:
http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2
Source1:
http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_%{debhelper_ver}.tar.gz
Source2:
http://ftp.de.debian.org/debian/pool/main/d/devscripts/devscripts_%{devscripts_ver}.tar.gz
@@ -54,7 +53,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
-BuildRequires: libbz2-devel sgmltool texlive-latex update-alternatives
+BuildRequires: libbz2-devel
+BuildRequires: sgmltool
+BuildRequires: texlive-latex
+BuildRequires: update-alternatives
Requires: update-alternatives
%if 0%{?suse_version} 1100
BuildRequires: libselinux-devel
@@ -65,15 +67,24 @@
%endif
%endif
%if 0%{?fedora_version}
-BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex
+BuildRequires: libselinux-devel
+BuildRequires: linuxdoc-tools
+BuildRequires: tetex-latex
+BuildRequires: texinfo-tex
%define use_selinux 1
%endif
%if 0%{?rhel_version}
-BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex
+BuildRequires: libselinux-devel
+BuildRequires: linuxdoc-tools
+BuildRequires: tetex-latex
+BuildRequires: texinfo-tex
%define use_selinux 1
%endif
%if 0%{?centos_version}
-BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex
+BuildRequires: libselinux-devel
+BuildRequires: linuxdoc-tools
+BuildRequires: tetex-latex
+BuildRequires: texinfo-tex
%define use_selinux 1
%endif
@@ -86,7 +97,6 @@
dpkg-doc, dpkg-dev, debhelper, and devscripts.
%package devel
-License:GPL-2.0+
Summary:Development files for dpkg
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
@@ -114,7 +124,6 @@
%patch5
%build
-%{?suse_update_config:%{suse_update_config -f}}
export CFLAGS=$RPM_OPT_FLAGS
%if 0%{?use_selinux}
export SELINUX_LIBS=-lselinux
++ update-alternatives.spec ++
--- /var/tmp/diff_new_pack.mwcdUA/_old 2012-01-04 07:23:47.0 +0100
+++ /var/tmp/diff_new_pack.mwcdUA/_new 2012-01-04 07:23:47.0 +0100
@@ -15,14 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define admindir %{_localstatedir}/lib/rpm/
%define debhelper_ver 8.1.2
%define devscripts_ver 2.10.71
Name: update-alternatives
Version:1.15.8.10
-Release:3
+Release:0
Url:http://ftp.de.debian.org/debian/pool/main/d/dpkg/
Summary:Maintain symbolic links determining default commands
License:GPL-2.0+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory checked in
at 2011-12-06 18:05:33
Comparing /work/SRC/openSUSE:Factory/deb (Old)
and /work/SRC/openSUSE:Factory/.deb.new (New)
Package is deb, Maintainer is pu...@suse.com
Changes:
update-alternatives.changes: same change
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.TpCJ2A/_old 2011-12-06 18:09:34.0 +0100
+++ /var/tmp/diff_new_pack.TpCJ2A/_new 2011-12-06 18:09:34.0 +0100
@@ -24,7 +24,7 @@
Version:1.15.8.10
Release:3
Url:http://www.debian.org
-License:GPLv2+
+License:GPL-2.0+
Group: System/Packages
Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
Requires: perl = %{perl_version}
@@ -86,7 +86,7 @@
dpkg-doc, dpkg-dev, debhelper, and devscripts.
%package devel
-License:GPLv2+
+License:GPL-2.0+
Summary:Development files for dpkg
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
++ update-alternatives.spec ++
--- /var/tmp/diff_new_pack.TpCJ2A/_old 2011-12-06 18:09:34.0 +0100
+++ /var/tmp/diff_new_pack.TpCJ2A/_new 2011-12-06 18:09:34.0 +0100
@@ -25,7 +25,7 @@
Release:3
Url:http://ftp.de.debian.org/debian/pool/main/d/dpkg/
Summary:Maintain symbolic links determining default commands
-License:GPLv2+
+License:GPL-2.0+
Group: System/Management
Source0:
http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2
Source1:
http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_%{debhelper_ver}.tar.gz
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory
checked in at Wed Sep 21 17:00:21 CEST 2011.
--- deb/deb.changes 2011-03-31 14:55:28.0 +0200
+++ /mounts/work_src_done/STABLE/deb/deb.changes2011-09-18
19:29:30.0 +0200
@@ -1,0 +2,7 @@
+Sun Sep 18 17:17:12 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+ (cf. packaging guidelines)
+- Use %_smp_mflags for parallel build
+
+---
update-alternatives.changes: same change
calling whatdependson for head-i586
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.OsTMTS/_old 2011-09-21 17:00:12.0 +0200
+++ /var/tmp/diff_new_pack.OsTMTS/_new 2011-09-21 17:00:12.0 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%define admindir %{_localstatedir}/lib/rpm/
%define debhelper_ver 8.1.2
@@ -90,7 +89,6 @@
License:GPLv2+
Summary:Development files for dpkg
Group: Development/Libraries/C and C++
-AutoReqProv:on
Requires: %{name} = %{version}
%description devel
@@ -129,7 +127,6 @@
--disable-compiler-warnings \
%endif
--localstatedir=%{_localstatedir}/lib\
- --libdir=%{_libdir} \
--with-admindir=%{_var}/lib/dpkg
# configure somehow does not detect architecture correctly in OBS
(bnc#469337), so
@@ -234,9 +231,6 @@
%fdupes %{buildroot}
%endif
-%clean
-rm -rf %{buildroot}
-
%post
cd %{_localstatedir}/lib/dpkg
for f in diversions statoverride status ; do
++ update-alternatives.spec ++
--- /var/tmp/diff_new_pack.OsTMTS/_old 2011-09-21 17:00:12.0 +0200
+++ /var/tmp/diff_new_pack.OsTMTS/_new 2011-09-21 17:00:12.0 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%define admindir %{_localstatedir}/lib/rpm/
%define debhelper_ver 8.1.2
@@ -70,8 +69,8 @@
%{configure} \
--with-admindir=%{admindir}
-make -C lib/compat
-make -C utils/
+make -C lib/compat %{?_smp_mflags}
+make -C utils/ %{?_smp_mflags}
%install
%{__install} -d -m 0755 %{buildroot}/%{_sbindir}/
@@ -85,9 +84,6 @@
touch %{buildroot}/%{_localstatedir}/log/%{name}.log
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%doc COPYING
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit deb for openSUSE:Factory
Hello community,
here is the log from the commit of package deb for openSUSE:Factory
checked in at Mon May 16 12:03:42 CEST 2011.
--- deb/deb.changes 2011-03-17 16:33:01.0 +0100
+++ /mounts/work_src_done/STABLE/deb/deb.changes2011-03-31
14:55:28.0 +0200
@@ -1,0 +2,5 @@
+Thu Mar 31 11:39:18 UTC 2011 - flichtenh...@astaro.com
+
+- Merge openSUSE:Tools changes with system:packagemanager changes
+
+---
@@ -17,0 +23,12 @@
+
+---
+Fri Jan 28 14:17:27 UTC 2011 - adr...@suse.de
+
+- fix build on old distros
+
+---
+Fri Jan 28 12:57:25 UTC 2011 - flichtenh...@astaro.com
+
+- install missing debhelper files
+ - install dh
+ - install Debian/Debhelper/Buildsystem/*.pm
calling whatdependson for head-i586
New:
devscripts-pod2man-no-utf8.patch
dpkg-pod2man-no-utf8.patch
Other differences:
--
++ deb.spec ++
--- /var/tmp/diff_new_pack.qvmAdX/_old 2011-05-16 11:56:00.0 +0200
+++ /var/tmp/diff_new_pack.qvmAdX/_new 2011-05-16 11:56:00.0 +0200
@@ -23,13 +23,13 @@
Name: deb
Version:1.15.8.10
-Release:2
+Release:3
Url:http://www.debian.org
License:GPLv2+
Group: System/Packages
Provides: dpkg dpkg-dev debhelper dselect dpkg-doc devscripts
Requires: perl = %{perl_version}
-Requires: cpio patch make html2text update-alternatives
+Requires: cpio patch make html2text
Summary:Tools for Debian Packages
Source0:
http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.bz2
Source1:
http://ftp.de.debian.org/debian/pool/main/d/debhelper/debhelper_%{debhelper_ver}.tar.gz
@@ -41,19 +41,42 @@
Patch3: devscripts-2.10.71-debcommit-hg16.patch
Patch4: update-alternatives-1.15.8.10-suse.patch
Patch5: dpkg-1.15.8.10-archtable-suse.patch
+Patch6: dpkg-pod2man-no-utf8.patch
+Patch7: devscripts-pod2man-no-utf8.patch
BuildRequires: gcc-c++
BuildRequires: ncurses-devel
BuildRequires: zlib-devel
-BuildRequires: libselinux-devel
+%if 0%{?suse_version} 1010
BuildRequires: fdupes
+%endif
BuildRequires: libxslt
BuildRequires: docbook-xsl-stylesheets
-BuildRequires: update-alternatives
Requires(pre): /bin/touch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if %suse_version 1120
+
+%if 0%{?suse_version}
+BuildRequires: libbz2-devel sgmltool texlive-latex update-alternatives
+Requires: update-alternatives
+%if 0%{?suse_version} 1100
+BuildRequires: libselinux-devel
+%define use_selinux 1
+%endif
+%if 0%{?suse_version} 1120
%define _libexecdir /usr/lib
%endif
+%endif
+%if 0%{?fedora_version}
+BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex
+%define use_selinux 1
+%endif
+%if 0%{?rhel_version}
+BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex
+%define use_selinux 1
+%endif
+%if 0%{?centos_version}
+BuildRequires: libselinux-devel linuxdoc-tools tetex-latex texinfo-tex
+%define use_selinux 1
+%endif
%description
This package contains tools for working with Debian packages. It makes
@@ -83,20 +106,28 @@
%patch0
%patch1
-%if %suse_version 1130
+%if 0%{?suse_version} 0%{?suse_version} 1130
%patch2
+%patch6
+%patch7
%endif
%patch3
%patch4
%patch5
%build
-#pushd dpkg-%{version}
%{?suse_update_config:%{suse_update_config -f}}
export CFLAGS=$RPM_OPT_FLAGS
+%if 0%{?use_selinux}
export SELINUX_LIBS=-lselinux
+%endif
%{configure}\
+%if 0%{?use_selinux}
--with-selinux \
+%endif
+%if 0%{?suse_version} 0%{?suse_version} 1110
+ --disable-compiler-warnings \
+%endif
--localstatedir=%{_localstatedir}/lib\
--libdir=%{_libdir} \
--with-admindir=%{_var}/lib/dpkg
@@ -172,6 +203,8 @@
# perl modules:
install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper
install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence
+install -d -m 755 %{buildroot}%{perl_vendorlib}/Debian/Debhelper/Buildsystem
+install -m 644 Debian/Debhelper/Buildsystem/*.pm
%{buildroot}%{perl_vendorlib}/Debian/Debhelper/Buildsystem
install -m 644 Debian/Debhelper/Sequence/*.pm
%{buildroot}%{perl_vendorlib}/Debian/Debhelper/Sequence
install -m 644 Debian/Debhelper/*.pm
%{buildroot}%{perl_vendorlib}/Debian/Debhelper
# docs:
@@ -187,15 +220,19 @@
# binaries:
install -d -m 755 %{buildroot}%{_bindir}
install -m 755 dh_*[^1-9] %{buildroot}%{_bindir}
+install -m 755 dh %{buildroot}%{_bindir}
popd # debhelper
pushd ../devscripts-%{devscripts_ver}
make install DESTDIR=%{buildroot}
+popd
+
# extras
install -m 755 %{SOURCE3} %{buildroot}%{_bindir}
-popd
+%if 0%{?suse_version} 1010
%fdupes %{buildroot}
