From 666665797f92ff5f286757c90a160f9370043c42b025083e2c103b132e6d28b0 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Thu, 20 Sep 2012 11:49:01 +0000 Subject: [PATCH 1/7] Accepting request 135139 from home:kukuk:branches:Base:System - SuSEconfig is finally gone [FATE#100011] OBS-URL: https://build.opensuse.org/request/show/135139 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=392 --- aaa_base.changes | 5 +++++ aaa_base.spec | 8 ++------ aaa_base.tar.bz2 | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 885b635..60e46c6 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 20 13:35:49 CEST 2012 - kukuk@suse.de + +- SuSEconfig is finally gone [FATE#100011] + ------------------------------------------------------------------- Thu Sep 13 13:49:44 UTC 2012 - coolo@suse.com diff --git a/aaa_base.spec b/aaa_base.spec index 3e96078..f14e71b 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -49,8 +49,8 @@ Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc %description -This package installs several important configuration files. Central -scripts like SuSEconfig are also in this package. +This package installs several important configuration files +and central scripts. %package extras Summary: SUSE Linux Base Package (recommended part) @@ -174,7 +174,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /etc/init.d/reboot %dir /lib/aaa_base /lib/aaa_base/convert_sysctl* -/lib/YaST/SuSEconfig.functions %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-mtab.sh @@ -183,7 +182,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /sbin/refresh_initrd /sbin/service /sbin/smart_agetty -/sbin/SuSEconfig /usr/bin/ChangeSymlinks /usr/bin/filesize /usr/bin/mkinfodir @@ -204,7 +202,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/share/man/man8/safe-rm.8* /usr/share/man/man8/safe-rmdir.8* /usr/share/man/man8/service.8* -/usr/share/man/man8/SuSEconfig.8* /var/adm/fillup-templates/sysconfig.backup /var/adm/fillup-templates/sysconfig.boot /var/adm/fillup-templates/sysconfig.clock @@ -213,7 +210,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /var/adm/fillup-templates/sysconfig.news /var/adm/fillup-templates/sysconfig.proxy /var/adm/fillup-templates/sysconfig.shutdown -/var/adm/fillup-templates/sysconfig.suseconfig /var/adm/fillup-templates/sysconfig.windowmanager %dir /lib/udev %dir /lib/udev/devices diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index bc77801..8389249 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:233d1a2299f1c2aa77e41b88f5a5d9da0a8bf1c016923303dac6f5eb50db71eb -size 114485 +oid sha256:e2350a4c3cb9a300769a46d158c3f676968ab38186a696c4d4ccda8fff19e454 +size 111297 From 28fcf80c804394b9e2b0d4adfcb7a08077c2366b2ca4fb1e8c5370b5db68288b Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 21 Sep 2012 13:58:33 +0000 Subject: [PATCH 2/7] osc copypac from project:Base:System package:aaa_base revision:391 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=393 --- aaa_base.changes | 5 ----- aaa_base.spec | 8 ++++++-- aaa_base.tar.bz2 | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 60e46c6..885b635 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 20 13:35:49 CEST 2012 - kukuk@suse.de - -- SuSEconfig is finally gone [FATE#100011] - ------------------------------------------------------------------- Thu Sep 13 13:49:44 UTC 2012 - coolo@suse.com diff --git a/aaa_base.spec b/aaa_base.spec index f14e71b..3e96078 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -49,8 +49,8 @@ Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc %description -This package installs several important configuration files -and central scripts. +This package installs several important configuration files. Central +scripts like SuSEconfig are also in this package. %package extras Summary: SUSE Linux Base Package (recommended part) @@ -174,6 +174,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /etc/init.d/reboot %dir /lib/aaa_base /lib/aaa_base/convert_sysctl* +/lib/YaST/SuSEconfig.functions %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-mtab.sh @@ -182,6 +183,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /sbin/refresh_initrd /sbin/service /sbin/smart_agetty +/sbin/SuSEconfig /usr/bin/ChangeSymlinks /usr/bin/filesize /usr/bin/mkinfodir @@ -202,6 +204,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/share/man/man8/safe-rm.8* /usr/share/man/man8/safe-rmdir.8* /usr/share/man/man8/service.8* +/usr/share/man/man8/SuSEconfig.8* /var/adm/fillup-templates/sysconfig.backup /var/adm/fillup-templates/sysconfig.boot /var/adm/fillup-templates/sysconfig.clock @@ -210,6 +213,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /var/adm/fillup-templates/sysconfig.news /var/adm/fillup-templates/sysconfig.proxy /var/adm/fillup-templates/sysconfig.shutdown +/var/adm/fillup-templates/sysconfig.suseconfig /var/adm/fillup-templates/sysconfig.windowmanager %dir /lib/udev %dir /lib/udev/devices diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 8389249..bc77801 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2350a4c3cb9a300769a46d158c3f676968ab38186a696c4d4ccda8fff19e454 -size 111297 +oid sha256:233d1a2299f1c2aa77e41b88f5a5d9da0a8bf1c016923303dac6f5eb50db71eb +size 114485 From 0ab4b91ed9a2b73db65153cd590e4554e53de3c218780751d1a9b277de2a53b5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 25 Sep 2012 13:50:10 +0000 Subject: [PATCH 3/7] Accepting request 135887 from home:a_jaeger:FactoryFix Update from git - remove SuSEconfig OBS-URL: https://build.opensuse.org/request/show/135887 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=394 --- aaa_base.changes | 5 +++++ aaa_base.spec | 7 +------ aaa_base.tar.bz2 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 885b635..60e46c6 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 20 13:35:49 CEST 2012 - kukuk@suse.de + +- SuSEconfig is finally gone [FATE#100011] + ------------------------------------------------------------------- Thu Sep 13 13:49:44 UTC 2012 - coolo@suse.com diff --git a/aaa_base.spec b/aaa_base.spec index 3e96078..527e69d 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -49,8 +49,7 @@ Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc %description -This package installs several important configuration files. Central -scripts like SuSEconfig are also in this package. +This package installs several important configuration files and central scripts. %package extras Summary: SUSE Linux Base Package (recommended part) @@ -174,7 +173,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /etc/init.d/reboot %dir /lib/aaa_base /lib/aaa_base/convert_sysctl* -/lib/YaST/SuSEconfig.functions %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-mtab.sh @@ -183,7 +181,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /sbin/refresh_initrd /sbin/service /sbin/smart_agetty -/sbin/SuSEconfig /usr/bin/ChangeSymlinks /usr/bin/filesize /usr/bin/mkinfodir @@ -204,7 +201,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/share/man/man8/safe-rm.8* /usr/share/man/man8/safe-rmdir.8* /usr/share/man/man8/service.8* -/usr/share/man/man8/SuSEconfig.8* /var/adm/fillup-templates/sysconfig.backup /var/adm/fillup-templates/sysconfig.boot /var/adm/fillup-templates/sysconfig.clock @@ -213,7 +209,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /var/adm/fillup-templates/sysconfig.news /var/adm/fillup-templates/sysconfig.proxy /var/adm/fillup-templates/sysconfig.shutdown -/var/adm/fillup-templates/sysconfig.suseconfig /var/adm/fillup-templates/sysconfig.windowmanager %dir /lib/udev %dir /lib/udev/devices diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index bc77801..f9153bd 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:233d1a2299f1c2aa77e41b88f5a5d9da0a8bf1c016923303dac6f5eb50db71eb -size 114485 +oid sha256:7f34c1aa80a0b02b9c290854a87635d7f6435e90c5e06455c8e03407c62dd906 +size 111271 From 67f98445dd5c84099b4ab18d9452ad28f2fc7406ec5a2733fe1016cc51b32625 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 25 Sep 2012 13:51:28 +0000 Subject: [PATCH 4/7] - migrate to _service file to make it a bit more clear the .tar is not a random tar OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=395 --- _service | 12 ++++++++++++ aaa_base-12.3.tar.gz | 3 +++ aaa_base.changes | 6 ++++++ aaa_base.spec | 8 ++++---- aaa_base.tar.bz2 | 3 --- 5 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 _service create mode 100644 aaa_base-12.3.tar.gz delete mode 100644 aaa_base.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..3114aa1 --- /dev/null +++ b/_service @@ -0,0 +1,12 @@ + + + 12.3 + git://gitorious.org/opensuse/aaa_base.git + git + + + gz + *.tar + + + diff --git a/aaa_base-12.3.tar.gz b/aaa_base-12.3.tar.gz new file mode 100644 index 0000000..48ed635 --- /dev/null +++ b/aaa_base-12.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:416b83b940e64249602055bbd7bfd3d41ea63f4af6d343703194e617f28bed35 +size 134616 diff --git a/aaa_base.changes b/aaa_base.changes index 60e46c6..44cee6c 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 25 13:50:59 UTC 2012 - coolo@suse.com + +- migrate to _service file to make it a bit more clear the .tar is + not a random tar + ------------------------------------------------------------------- Thu Sep 20 13:35:49 CEST 2012 - kukuk@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 527e69d..aba6c0c 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -17,7 +17,7 @@ Name: aaa_base -Version: 12.2 +Version: 12.3 Release: 0 Url: http://gitorious.org/opensuse/aaa_base Provides: aaa_skel = %{version}-%{release} @@ -44,8 +44,8 @@ Summary: SUSE Linux Base Package License: GPL-2.0+ Group: System/Fhs BuildRoot: %{_tmppath}/%{name}-%{version}-build -# run make package in checkout out git repo to recreate -Source: aaa_base.tar.bz2 +# run osc service dr to recreate +Source: aaa_base-%{version}.tar.gz Source99: aaa_base-rpmlintrc %description @@ -73,7 +73,7 @@ malloc checks to catch potential heap corruptions. It's not installed by default as it may degrade performance. %prep -%setup -n aaa_base +%setup %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 deleted file mode 100644 index f9153bd..0000000 --- a/aaa_base.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f34c1aa80a0b02b9c290854a87635d7f6435e90c5e06455c8e03407c62dd906 -size 111271 From 7180b5820ef3f2e9c850f34a5ce1cb8c8dfc8868e0319d3d8e347b22f378bb46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Thu, 27 Sep 2012 16:15:55 +0000 Subject: [PATCH 5/7] Accepting request 136105 from home:a_jaeger:FactoryFix Add README.packaging.txt, git update. OBS-URL: https://build.opensuse.org/request/show/136105 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=396 --- README.packaging.txt | 15 +++++++++++++++ aaa_base-12.3.tar.gz | 4 ++-- aaa_base.changes | 6 ++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 README.packaging.txt diff --git a/README.packaging.txt b/README.packaging.txt new file mode 100644 index 0000000..123787d --- /dev/null +++ b/README.packaging.txt @@ -0,0 +1,15 @@ +This package should use just the content of the git tree. If you need +to make changes, you have the following options: +* Make them in git and update the package from git (you can send merge + request if you don't have write access) +* Create a patch, add the patch to the package and let one of the + aaa_base packagers commit it for you + +The online repository is at: +http://gitorious.org/opensuse/aaa_base + +For building the package from git run the service directly: +osc service disabledrun + +Note that aaa_base.spec and aaa_base.changes are not part of the git +repo. diff --git a/aaa_base-12.3.tar.gz b/aaa_base-12.3.tar.gz index 48ed635..34a3a7e 100644 --- a/aaa_base-12.3.tar.gz +++ b/aaa_base-12.3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:416b83b940e64249602055bbd7bfd3d41ea63f4af6d343703194e617f28bed35 -size 134616 +oid sha256:683954d65d8dce06c2c55571625c1bac32a647d18c3bb132214a34e9df15f837 +size 137113 diff --git a/aaa_base.changes b/aaa_base.changes index 44cee6c..f1a52fd 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 26 11:18:35 UTC 2012 - aj@suse.de + +- Fix linuxbase URLs to point to the current documentation +- Add README.packaging.txt. + ------------------------------------------------------------------- Tue Sep 25 13:50:59 UTC 2012 - coolo@suse.com From ba93ae6a0b621a9cb09457886fab1c7963ca3f749b85e4aa420b1dca3e04467b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 5 Oct 2012 10:40:58 +0000 Subject: [PATCH 6/7] Accepting request 136999 from home:a_jaeger:FactoryFix Create loop devices via tmpfiles and not via /lib/udev/devices. OBS-URL: https://build.opensuse.org/request/show/136999 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=397 --- aaa_base-12.3.tar.gz | 4 ++-- aaa_base.changes | 5 +++++ aaa_base.spec | 22 ++++++++-------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/aaa_base-12.3.tar.gz b/aaa_base-12.3.tar.gz index 34a3a7e..4336178 100644 --- a/aaa_base-12.3.tar.gz +++ b/aaa_base-12.3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:683954d65d8dce06c2c55571625c1bac32a647d18c3bb132214a34e9df15f837 -size 137113 +oid sha256:44a8e77938e32d994477172d5fd5de9a87917ebe6625bb33f6486259384da104 +size 137769 diff --git a/aaa_base.changes b/aaa_base.changes index f1a52fd..fbf6140 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 4 08:26:50 UTC 2012 - aj@suse.de + +- Create loop devices via tmpfiles and not via /lib/udev/devices. + ------------------------------------------------------------------- Wed Sep 26 11:18:35 UTC 2012 - aj@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index aba6c0c..9e4399e 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -46,6 +46,11 @@ Group: System/Fhs BuildRoot: %{_tmppath}/%{name}-%{version}-build # run osc service dr to recreate Source: aaa_base-%{version}.tar.gz +# +# Read README.packaging.txt before making any changes to this +# package +# +Source1: README.packaging.txt Source99: aaa_base-rpmlintrc %description @@ -73,7 +78,7 @@ malloc checks to catch potential heap corruptions. It's not installed by default as it may degrade performance. %prep -%setup +%setup -q %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} @@ -98,9 +103,6 @@ test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 for i in passwd group shadow gshadow ; do touch $RPM_BUILD_ROOT/var/adm/fillup-templates/$i.aaa_base done -# -# loop module auto loading bnc#661715 -mkdir -p $RPM_BUILD_ROOT/lib/udev/devices %pre -f aaa_base.pre @@ -190,6 +192,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /usr/bin/safe-rmdir /usr/bin/setJava /usr/lib/restricted/bin/hostname +%dir /usr/lib/tmpfiles.d +/usr/lib/tmpfiles.d/loop.conf /usr/sbin/Check /usr/sbin/rcpowerfail /usr/sbin/rcrandom @@ -210,16 +214,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save /var/adm/fillup-templates/sysconfig.proxy /var/adm/fillup-templates/sysconfig.shutdown /var/adm/fillup-templates/sysconfig.windowmanager -%dir /lib/udev -%dir /lib/udev/devices -%ghost %attr(660,root,disk) %dev(b,7,0) /lib/udev/devices/loop0 -%ghost %attr(660,root,disk) %dev(b,7,1) /lib/udev/devices/loop1 -%ghost %attr(660,root,disk) %dev(b,7,2) /lib/udev/devices/loop2 -%ghost %attr(660,root,disk) %dev(b,7,3) /lib/udev/devices/loop3 -%ghost %attr(660,root,disk) %dev(b,7,4) /lib/udev/devices/loop4 -%ghost %attr(660,root,disk) %dev(b,7,5) /lib/udev/devices/loop5 -%ghost %attr(660,root,disk) %dev(b,7,6) /lib/udev/devices/loop6 -%ghost %attr(660,root,disk) %dev(b,7,7) /lib/udev/devices/loop7 %files extras %defattr(-,root,root) From 95465245cd20ba51116f665c2de24042214d15c36bdf3a40181b54d5db57ff84 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 5 Oct 2012 15:53:43 +0000 Subject: [PATCH 7/7] . OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=398 --- aaa_base.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aaa_base.changes b/aaa_base.changes index fbf6140..46bcd5c 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 5 15:50:23 UTC 2012 - werner@suse.de + +- Try to resolve the bash completion problems with ls (bnc#725657) + ------------------------------------------------------------------- Thu Oct 4 08:26:50 UTC 2012 - aj@suse.de