April 2013 - openSUSE Commits - openSUSE Mailing Lists

commit openstack-glance for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-glance for openSUSE:Factory checked in at 2013-04-29 14:09:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-glance (Old) and /work/SRC/openSUSE:Factory/.openstack-glance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-glance", Maintainer is "radmanic(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance-doc.changes 2013-01-17 09:52:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance-doc.changes 2013-04-29 14:09:11.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Mar 18 10:40:43 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +------------------------------------------------------------------- +Fri Feb 22 10:24:40 UTC 2013 - saschpe(a)suse.de + +- Require openstack-suse-macros instead of openstack-macros + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes 2013-03-25 20:41:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes 2013-04-29 14:09:11.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 4 16:34:56 UTC 2013 - dmueller(a)suse.com + +- update to grizzly-stable + +------------------------------------------------------------------- +Tue Apr 2 08:39:30 UTC 2013 - speilicke(a)suse.com + +- Update to version 2013.1.rc2 + @@ -2 +12 @@ -Thu Mar 14 20:23:37 UTC 2013 - vuntz(a)suse.com +Tue Mar 26 12:32:36 UTC 2013 - opensuse-cloud(a)opensuse.org @@ -4,3 +14 @@ -- Update to version 2012.2.4+git.1363292617.dd849a9: - + Do not return location in headers (CVE-2013-1840) -- This fixes bnc#808626. +- Downgrade to version 2013.1.rc1 @@ -9 +17 @@ -Tue Mar 12 09:06:56 UTC 2013 - vuntz(a)suse.com +Mon Mar 25 13:50:43 UTC 2013 - opensuse-cloud(a)opensuse.org @@ -11,6 +19,10 @@ -- Update to version 2012.2.4+git.1363079216.04f88c8: - + Clean dangling image fragments in filesystem store - + Wait in TestBinGlance.test_update_copying_from until image is active - + Fixes deletion of invalid image member -- Drop glance-test_bin_glance-fail-on-slow-machines.patch: fixed - upstream. +- Update to version 2013.2.a117.ga3c0a5f: + + Handle Swift 404 in scrubber + + Don't print sql password in debug messages + + Delete swift segments when image_size_cap exceeded + + bump version to 2013.2 + +------------------------------------------------------------------- +Mon Mar 18 10:40:37 UTC 2013 - speilicke(a)suse.com + +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix @@ -19 +31 @@ -Wed Mar 6 15:25:21 UTC 2013 - cloud-devel(a)suse.de +Sun Mar 17 00:12:19 UTC 2013 - cloud-devel(a)suse.de @@ -21,3 +33,30 @@ -- Update to version 2012.2.4+git.1362583521.1fb759d: - + Swallow UserWarning from glance-cache-manage - + Avoid dangling partial image on size/checksum mismatch +- Update to version 2013.1.a110.g975c5ac+git.1363479139.975c5ac: + + Fix calls to image_member_find in tests + + Retain migration 12 indexes for table image_properties with sqlite. + + Fix up publicize_image unit test + + Mark password options secret + + Fix visibility on db image_member_find + + Switch to final 1.1.0 oslo.config release + + Honor metadata_encryption_key in glance domain + + Publish API version 2.1 + + Insure that migration 6 retains deleted image property index. + + Log when image_size_cap has been exceeded + + Fix circular import in glance/db/sqlalchemy + + Fix check_003 method. + + Declare index on ImageMember model + + Fix uniqueness constraint on image_members table. + + Do not return location in headers + + Segmented images not deleted cleanly from swift. + + Document the os options config for swift store + + Fix scrubber and other utils to use log.setup(). + + Fix rabbit_max_retry + +------------------------------------------------------------------- +Fri Mar 15 17:45:26 UTC 2013 - iartarisi(a)suse.com + +- Change ownership of /var/cache/glance to the openstack-glance user + +------------------------------------------------------------------- +Fri Mar 15 15:33:05 UTC 2013 - iartarisi(a)suse.com + +- Move signing_dir to /var/cache/glance/(api|registry) @@ -26 +65,4 @@ -Tue Mar 5 17:17:04 UTC 2013 - cloud-devel(a)suse.de +Wed Mar 13 00:15:32 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a77.ge360117+git.1363133732.e360117: + + Characterize image_member_find @@ -28 +70,31 @@ -- Update to version 2012.2.4+git.1362503824.afe6166: +------------------------------------------------------------------- +Tue Mar 12 10:52:35 UTC 2013 - dmueller(a)suse.com + +- python-oslo-config -> python-oslo.config + +------------------------------------------------------------------- +Mon Mar 11 16:08:27 UTC 2013 - dmueller(a)suse.com + +- Add sqlalchemy-update.diff: + * Support SQLAlchemy 0.7.10 + +-------------------------------------------------------------------- +Mon Mar 11 09:58:17 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a76.gdf7d9c7+git.1362995897.df7d9c7: + + Refactor leaky abstractions + + A test for concurrency when glance uses sleep. + + Generate notification for cached v2 download + + Update acls in the domain model + + Switch to oslo.config. + + Remove unused variable 'image_member_factory' + + Ensure disk_ and container_format during upload + + Fix v2 data upload to swift + +-------------------------------------------------------------------- +Tue Mar 5 17:15:47 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a62.g3597718+git.1362503747.3597718: + + Pin jsonschema version below 1.0.0. + + Fix migration 016 for sqlite. + + Refactor data migration tests @@ -29,0 +102,136 @@ + + Redact location from notifications + + Removed controversial common image property 'os_libosinfo_shortid' + + Add migration 021 set_engine_mysql_innodb + + Add check for image_locations table + + monkey_patch the time module for eventlet + + Enable support for MySQL with test migrations. + + Remove unused imports + + Fix response code for successful image upload. + + Parse JSON Schema Draft 10 in v2 Image update + + Set status to 'active' after image is uploaded + + Add PostgreSQL support to test migrations. + + Add pre and check phases to test migration 004 + + Add pre and check phases to test migration 005 + + Update db layer to expose multiple image locations + + Added better schemas for image members, revised tests. + + Test date with UTC instead of local timezone. + + v1 api image-list does not return shared images + + Cannot change locations on immutable images + + Add pre and check phases to test migration 006 + + Update documentation to reflect API v2 image sharing + +------------------------------------------------------------------- +Mon Feb 25 13:01:49 UTC 2013 - saschpe(a)suse.de + +- Set 'notifier_strategy' configurable to support ceilometer + +------------------------------------------------------------------- +Mon Feb 25 10:06:40 UTC 2013 - saschpe(a)suse.de + +- Drop sysconfig from init scripts + +-------------------------------------------------------------------- +Sun Feb 24 18:13:23 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a21.gaa01e82+git.1361729603.aa01e82: + + Add migration 18 - create the image_locations table + + Use install_venv_common.py from oslo. + + Add an update option to run_tests.sh + + Create connection for each qpid notification. + + Use oslo-config-2013.1b3 + + Adding new common image properties + + Sync latest install_venv_common.py + + Filter images by status and add visibility shared + + Extend the domain model to v2 image data + + Add migration 19 - move image location data + + Add migration 20 - drop images.location + + Update oslo-config version. + + Document db_auto_create in default config files + + Remove compat cfg wrapper + + Use more-specific value for X-Object-Manifest header. + + Fix migration 015 downgrade with sqlite. + + Remove unnecessary logging from migration 019 + + Update openstack.common + + Avoid using logging in signal handlers + +------------------------------------------------------------------- +Fri Feb 22 10:24:27 UTC 2013 - saschpe(a)suse.de + +- Require openstack-suse-macros instead of openstack-macros + +------------------------------------------------------------------- +Thu Feb 21 17:11:24 UTC 2013 - iartarisi(a)suse.com + +- Add oslo-config requirement + +------------------------------------------------------------------- +Mon Feb 18 14:15:04 UTC 2013 - saschpe(a)suse.de + +- Init script cleanup: + + Drop useless shell variables + + Don't depend on $network facility, we already have $remote_fs + (comes after $network) + + Source /etc/sysconfig/openstack-glance (if available), orthogonal + to the other init scripts we provide. We're not using this feature + ATM though + + Use one init script template for all daemons +- Default configuration cleanup: + + Use openstack-utils to set as much default values in the package + as possible (instead of patch/sed/...). Some may be overwritting + later on by, .e.g., crowbar +- More useful lograte configuration: + + Compress ++++ 255 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes Old: ---- glance-lp1083155.patch glance-run-testsuite-as-root.patch glance-stable-folsom.tar.gz glance-webob-requestbodyfileget.patch glance-webob12b1-putrequest.patch openstack-glance-api.init openstack-glance-registry.init New: ---- glance-stable-grizzly.tar.gz openstack-glance.init sqlalchemy-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-glance-doc.spec ++++++ --- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200 @@ -19,15 +19,15 @@ %define component glance Name: openstack-%{component}-doc -Version: 2012.2.4+git.1363292617.dd849a9 -Release: 1 -License: Apache-2.0 +Version: 2013.1.1.a1.g43c5fda +Release: 0 Summary: OpenStack Image Service (Glance) - Documentation -Url: https://launchpad.net/glance +License: Apache-2.0 Group: Documentation/HTML -Source: glance-stable-folsom.tar.gz +Url: https://launchpad.net/glance +Source: glance-stable-grizzly.tar.gz BuildRequires: graphviz -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros BuildRequires: python-Sphinx BuildRequires: python-base BuildArch: noarch @@ -47,7 +47,7 @@ This package contains documentation files for openstack-glance. %prep -%setup -q -n glance-2012.2.4 +%setup -q -n glance-2013.1.1.a1.g43c5fda %openstack_cleanup_prep %build ++++++ openstack-glance.spec ++++++ --- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200 @@ -22,38 +22,32 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2012.2.4+git.1363292617.dd849a9 -Release: 1 -License: Apache-2.0 +Version: 2013.1.1.a1.g43c5fda +Release: 0 Summary: OpenStack Image Service (Glance) -Url: https://launchpad.net/glance +License: Apache-2.0 Group: System/Management -Source0: glance-stable-folsom.tar.gz -Source1: openstack-glance-api.init -Source2: openstack-glance-registry.init +Url: https://launchpad.net/glance +Source0: glance-stable-grizzly.tar.gz +Source1: openstack-glance.init # WSGI application skeleton for API app (for the SSL proxy): Source4: openstack-glance-api.wsgi Source5: %{name}.logrotate -# PATCH-FIX-UPSTREAM: saschpe(a)suse.de -- Backport of https://review.openstack.org/#/c/17798/ -Patch0: glance-run-testsuite-as-root.patch -# PATCH-FIX-UPSTREAM: saschpe(a)suse.de -- Backport of https://review.openstack.org/#/c/17926/ -Patch2: glance-lp1083155.patch -# PATCH-FIX-UPSTREAM: saschpe(a)suse.de -- Backport of https://review.openstack.org/#/c/17932/ -Patch3: glance-webob-requestbodyfileget.patch -# PATCH-FIX-UPSTREAM: saschpe(a)suse.de -- Backport of https://review.openstack.org/#/c/18036/ -Patch4: glance-webob12b1-putrequest.patch -# PATCH-FIX-UPSTREAM: saschpe(a)suse.de -- Backport of https://review.openstack.org/#/c/19380/ -Patch6: glance-default-signing_dir.patch +# PATCH-FIX-OPENSUSE: saschpe(a)suse.de -- #TODO/FIXME: similar to other services +Patch1: glance-default-signing_dir.patch +Patch2: sqlalchemy-update.diff BuildRequires: apache2 BuildRequires: fdupes -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros +BuildRequires: openstack-utils BuildRequires: python-base BuildRequires: python-distribute # Documentation build requirements: BuildRequires: python-Sphinx +Requires: logrotate Requires: python >= 2.6.8 Requires: python-glance = %{version} -Requires: logrotate +Requires: python-oslo.config # To generate a self-signed certificate to be used in demo setups: Requires(post): apache2-utils Requires(post): openssl @@ -94,19 +88,19 @@ Requires: python-PasteDeploy Requires: python-SQLAlchemy Requires: python-WebOb -Requires: python-anyjson +Requires: python-anyjson >= 0.2.4 Requires: python-argparse -Requires: python-boto -Requires: python-eventlet +Requires: python-boto >= 2.4.0 +Requires: python-eventlet >= 0.9.12 Requires: python-greenlet Requires: python-httplib2 Requires: python-iso8601 Requires: python-jsonschema -Requires: python-kombu +Requires: python-kombu >= 1.0.4 Requires: python-lxml Requires: python-passlib Requires: python-pycrypto -Requires: python-routes +Requires: python-routes >= 1.12.3 Requires: python-sqlalchemy-migrate Requires: python-swiftclient Requires: python-wsgiref @@ -120,11 +114,11 @@ Group: Development/Languages/Python Requires: %{name} = %{version} Requires: python-coverage +Requires: python-glanceclient Requires: python-mox Requires: python-nose Requires: python-nose-exclude Requires: python-nosehtmloutput -Requires: python-glanceclient Requires: python-openstack.nose_plugin Requires: python-pep8 Requires: python-pysendfile @@ -136,12 +130,9 @@ of OpenStack Glance. %prep -%setup -q -n glance-2012.2.4 -%patch0 -p1 +%setup -q -n glance-2013.1.1.a1.g43c5fda +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 %openstack_cleanup_prep sed -i "s|^#!.*||" tools/migrate_image_owners.py # Fix non-executable script warning # NOTE(saschpe): The following test contains a pesky (commented) race condition @@ -153,7 +144,7 @@ python setup.py build_sphinx -b man %install -python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} +python setup.py install --prefix=%{_prefix} --root=%{buildroot} ### directories install -d -m 755 %{buildroot}%{_localstatedir}/lib/glance @@ -170,12 +161,13 @@ install -p -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} ### init scripts -mkdir -p %{buildroot}%{_initddir} -install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/openstack-glance-api -install -m 755 %{SOURCE2} %{buildroot}%{_initddir}/openstack-glance-registry mkdir -p %{buildroot}%{_sbindir} -ln -s ../..%{_initddir}/openstack-glance-api %{buildroot}%{_sbindir}/rcopenstack-glance-api -ln -s ../..%{_initddir}/openstack-glance-registry %{buildroot}%{_sbindir}/rcopenstack-glance-registry +for i in api registry ; do + tmp=$(mktemp) + cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp + install -D -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i + ln -s ../..%{_initddir}/%{name}-$i %{buildroot}%{_sbindir}/rc%{name}-$i +done ### documentation install -d %{buildroot}%{_mandir}/man1 @@ -193,12 +185,23 @@ ### misc %fdupes %{buildroot}%{python_sitelib}/%{component} -# Drop the "glance" binary, there is glanceclient: -rm %{buildroot}%{_bindir}/glance +### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) +for i in api registry ; do + openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-$i.conf DEFAULT verbose True + openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-$i.conf paste_deploy flavor keystone + #TODO/FIXME(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? + openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-$i.conf sql connection sqlite:////var/lib/glance/glance.db +done +#NOTE(saschpe): Needed for (at least) ceilometer to colect image counters stats: +openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-api.conf DEFAULT notifier_strategy rabbit + +### authentication cache dir +mkdir -p %{buildroot}%{_localstatedir}/cache/glance/api +mkdir -p %{buildroot}%{_localstatedir}/cache/glance/registry %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/glance -s /sbin/nologin -c "OpenStack glance Daemons" %{username} +getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/glance -s /sbin/nologin -c "OpenStack Glance Daemons" %{username} exit 0 %post @@ -217,13 +220,13 @@ %doc LICENSE README.rst %dir %{_sysconfdir}/glance %config(noreplace) %{_sysconfdir}/glance/glance-api.conf -%config(noreplace) %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-api-paste.ini +%config %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-api-paste.ini %config(noreplace) %{_sysconfdir}/glance/glance-cache.conf %config(noreplace) %{_sysconfdir}/glance/glance-registry.conf -%config(noreplace) %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-registry-paste.ini +%config %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-registry-paste.ini %config(noreplace) %{_sysconfdir}/glance/glance-scrubber.conf -%config(noreplace) %{_sysconfdir}/glance/logging.cnf.sample -%config(noreplace) %{_sysconfdir}/glance/policy.json +%config %{_sysconfdir}/glance/logging.cnf.sample +%config %{_sysconfdir}/glance/policy.json %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(0755, %{username}, %{username}) %{_localstatedir}/lib/glance %dir %attr(0755, %{username}, %{username}) %{_localstatedir}/lib/glance/images @@ -256,6 +259,7 @@ %openstack_apache_ssl_cert_files %dir %attr(0755, root, root) %{_localstatedir}/lib/glance/wsgi %attr(0644, root, root) %{_localstatedir}/lib/glance/wsgi/*.wsgi +%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/cache/glance %files -n python-glance %defattr(-,root,root,-) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/glance/glance-stable-folsom.tar.gz</param> - <param name="email">cloud-devel(a)suse.de</param> + <param name="url">http://tarballs.openstack.org/glance/glance-stable-grizzly.tar.gz</param> + <param name="email">opensuse-cloud(a)opensuse.org</param> + <param name="plain-version">True</param> </service> </services> ++++++ glance-default-signing_dir.patch ++++++ --- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200 @@ -1,22 +1,18 @@ -commit fc3a232082a923dcd3e490104500691b1bbd5189 -Author: Sascha Peilicke <saschpe(a)suse.de> -Date: Thu Jan 10 13:22:42 2013 +0100 - - Set default signing_dir in etc/glance-api-paste.ini - - Currently, if not set, the default in keystone/middleware/auth_token.py - is $HOME/signing_dir (See bug 1031022, bug 1031008 bug and bug 1036847) - which may fail depending on the user glance / glanceclient is run and - the home directory set. - - /tmp is always writable and the directory name is unique enough - - Change-Id: I3a8de371ccdf52a8ebe31e6dc1b5f1cc3e95b0ef - -diff --git a/etc/glance-api-paste.ini b/etc/glance-api-paste.ini -index 0b29bc9..8c3631a 100644 ---- a/etc/glance-api-paste.ini -+++ b/etc/glance-api-paste.ini -@@ -57,1 +57,2 @@ paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddl +Binary files a/etc/.glance-api-paste.ini.swp and b/etc/.glance-api-paste.ini.swp differ +Binary files a/etc/.glance-registry-paste.ini.swp and b/etc/.glance-registry-paste.ini.swp differ +diff -ruN a/etc/glance-api-paste.ini b/etc/glance-api-paste.ini +--- a/etc/glance-api-paste.ini 2013-01-17 23:09:11.000000000 +0100 ++++ b/etc/glance-api-paste.ini 2013-01-24 14:28:53.000000000 +0100 +@@ -55,3 +55,4 @@ + [filter:authtoken] + paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory delay_auth_decision = true -+signing_dir = /tmp/keystone-signing-glance ++signing_dir = /var/cache/glance/api +diff -ruN a/etc/glance-registry-paste.ini b/etc/glance-registry-paste.ini +--- a/etc/glance-registry-paste.ini 2013-01-17 23:09:11.000000000 +0100 ++++ b/etc/glance-registry-paste.ini 2013-01-24 14:29:03.000000000 +0100 +@@ -17,3 +17,4 @@ + + [filter:authtoken] + paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory ++signing_dir = /var/cache/glance/registry ++++++ openstack-glance-api.init -> openstack-glance.init ++++++ --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance-api.init 2012-11-13 11:41:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.init 2013-04-29 14:09:11.000000000 +0200 @@ -1,110 +1,72 @@ #!/bin/sh # ### BEGIN INIT INFO -# Provides: openstack-glance-api -# Required-Start: $syslog $remote_fs -# Should-Start: $time mysql postgresql -# Should-Stop: $time mysql postgresql -# Required-Stop: $syslog $remote_fs +# Provides: openstack-glance-__NAME__ +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Should-Start: mysql postgresql +# Should-Stop: mysql postgresql # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: OpenStack Image Service (Glance) API -# Description: The OpenStack glance service allows to -# Discover, Register and Retrieve virtual machine images +# Short-Description: OpenStack Image Service (Glance) - __NAME__ +# Description: OpenStack Image Service (Glance) - __NAME__ ### END INIT INFO -GLANCE_CONTROL=/usr/bin/glance-control -GLANCE_API_BIN=/usr/bin/glance-api -GLANCE_API_CONFIG=/etc/glance/glance-api.conf -GLANCE_RUN_DIR=/var/run/glance -GLANCE_SYSTEM_USER=openstack-glance +DAEMON="__NAME__" +USER="openstack-glance" +CONFFILE="/etc/glance/glance-$DAEMON.conf" +RUNDIR="/var/run/glance" -mkdir -p $GLANCE_RUN_DIR -BAD=false -for i in $GLANCE_CONTROL $GLANCE_API_BIN; do - test -x $i && continue - echo "$i not installed" - BAD=true -done - -# Special treatment of stop for LSB conformance -if $BAD; then - test "$1" = "stop" && exit 0 - exit 5 -fi - -# Check for existence of needed config file and read it -if ! test -r $GLANCE_API_CONFIG; then - echo "$GLANCE_API_CONFIG not existing" - test "$1" = "stop" && exit 0 - exit 6 -fi +# $RUNDIR can be tmpfs, thus we have to create/own it here: +mkdir -p $RUNDIR && chown $USER. $RUNDIR . /etc/rc.status -rc_reset - -# Return values acc. to LSB for all commands but status: -# 0 - success -# 1 - generic or unspecified error -# 2 - invalid or excess argument(s) -# 3 - unimplemented feature (e.g. "reload") -# 4 - user had insufficient privileges -# 5 - program is not installed -# 6 - program is not configured -# 7 - program is not running -# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) -# -# Note that starting an already running service, stopping -# or restarting a not-running service as well as the restart -# with force-reload (in case signaling is not supported) are -# considered a success. - case "$1" in start) - echo -n "Starting Glance API" - /sbin/startproc -q -s -u $GLANCE_SYSTEM_USER $GLANCE_API_BIN --config-file=$GLANCE_API_CONFIG - rc_status -v - ;; + echo -n "Starting glance-$DAEMON" + /sbin/startproc -q -s -u $USER /usr/bin/glance-$DAEMON --config-file=$CONFFILE + rc_status -v + ;; stop) - echo -n "Shutting down Glance API" - /sbin/killproc $GLANCE_API_BIN - rc_status -v - ;; - try-restart|condrestart) - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - rc_status - ;; + echo -n "Shutting down glance-$DAEMON" + /sbin/killproc /usr/bin/glance-$DAEMON + rc_status -v + ;; restart) - $0 stop - $0 start - rc_status - ;; + $0 stop + $0 start + rc_status + ;; force-reload) - $0 try-restart - rc_status - ;; + $0 try-restart + rc_status + ;; reload) - echo -n "Reload service glance-api " - rc_failed 3 - rc_status -v - ;; + echo -n "Reload service glance-$DAEMON" + rc_failed 3 + rc_status -v + ;; status) - echo -n "Checking for service glance-api" - /sbin/checkproc $GLANCE_API_BIN - rc_status -v - ;; + echo -n "Checking for service glance-$DAEMON" + /sbin/checkproc /usr/bin/glance-$DAEMON + rc_status -v + ;; + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + rc_status # Remember status and be quiet + ;; *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac rc_exit ++++++ openstack-glance.logrotate ++++++ --- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200 @@ -1,5 +1,13 @@ +compress + /var/log/glance/*.log { - daily + rotate 15 + size 1M + weekly + dateext missingok + notifyempty su openstack-glance openstack-glance + copytruncate + sharedscripts } ++++++ sqlalchemy-update.diff ++++++ commit 7474b19a62b57ac61e5b261ea0cb58aabe4e04b0 Author: Dirk Mueller <dirk(a)dmllr.de> Date: Mon Mar 11 16:12:30 2013 +0100 Pin SQLAlchemy to 0.7.x 0.7.10 has been released and is compatible with 0.7.x. Instead of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8 Also sync the 0.7.x requirements to 0.7.8 (to be in sync with other OpenStack core components) Change-Id: I6f47e7d27fcf0c7271bb2c91a4615ef0bb5e2643 diff --git a/tools/pip-requires b/tools/pip-requires index 2beb403..cbcba1f 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -3,7 +3,7 @@ # package to get the right headers... greenlet>=0.3.1 -SQLAlchemy>=0.7,<=0.7.9 +SQLAlchemy>=0.7.8,<0.8 anyjson eventlet>=0.9.12 PasteDeploy -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openstack-cinder for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package openstack-cinder for openSUSE:Factory checked in at 2013-04-29 14:08:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old) and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-cinder", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder-doc.changes 2013-01-17 09:51:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder-doc.changes 2013-04-29 14:08:52.000000000 +0200 @@ -1,0 +2,184 @@ +Tue Feb 26 11:21:48 UTC 2013 - dmueller(a)suse.com + +- add python-oslo-config buildrequires + +------------------------------------------------------------------- +Fri Feb 22 11:23:00 UTC 2013 - saschpe(a)suse.de + +- BuildRequire openstack-suse-macros instead of openstack-macros + +------------------------------------------------------------------- +Tue Jan 15 15:36:50 UTC 2013 - saschpe(a)suse.de + +- Revert "fix", it's sufficient to require python-cinder + +-------------------------------------------------------------------- +Tue Jan 15 14:08:28 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1+git.1358255308.7905b6b: + + Factor out LVM code. + +-------------------------------------------------------------------- +Mon Jan 14 12:01:00 UTC 2013 - dmueller(a)suse.com + +- Update to version 2013.1+git.1358161260.643f916: + + Implement filter scheduler + + Revert "Implement filter scheduler" + + Provide HP 3PAR array iSCSI driver + + Fix CinderClient exception name in EMCISCSIDriver. + + Enable cinder exception format checking in tests. + + Update exceptions to pass correct kwargs. + + Add option to make exception format errors fatal. + + Implement filter scheduler + + Use tempdir for lock_path in tests. + + Make WebOb version specification more flexible + + Fix cmds clearing in TargetAdminTestCase. + + Add missing library + + use deleted = False, not 0 for update + + Implement ability to Clone volumes in Cinder. + + Add pyflakes + + Adds synchronization to attach volume. + + Add EMC Volume Driver in Cinder + + Adding marker, pagination, sort key and sort direction to v2 api + + Fix typo in image_utils tempfile handling + + Make the NetAppISCSIDriver._is_clone_done() method able to handle + + Make sure we don't double remove tmp on exception + + Add service mgmt extension. + + Added the lockutils, fileutils, gettextutils + + Fixes a Windows volume driver bug on disk export + + Moving host admin extension with other extensions + + Allow the lvm backed drivers to use mirrrors + + CHAP support for IBM Storwize/SVC driver. + + Remove instance quota re-sync code + + Add image metadata API extension + + Raise NotImplemented for drivers that don't support images + + Add *.swp to gitignore. + + Support glance servers over https + + Add commands used by NFS volume driver to rootwrap + + Changing display_name to name in v2 api + + Make summary and detail view consistent with other projects + + creating separate v1 and v2 stubs and general fakes + + Make copy_to_volume a bit more useful. + + Delete type call in api needs update to use ID. + + Convert volume_type id from int to uuid. + + Rename Config osapi_compute_link_prefix to osapi_volume_base_URL + + Fix exception when size is None. + + Ensure request_spec can be serialized. + + attaching volumes will set instance_uuid instantly + + Revert changes to monkey_patch. + + Improve provider_location cleanup code for RBD. + + Fix import order to make it alphabetical. + + Fix None being passed into as_int(). + + Use auth_token middleware from keystoneclient. + + Provide i18n to those messages without _() + + Revert "use O_DIRECT when copying from /dev/zero too" + + Make pep8 checks a bit stricter. + + Unpin lxml requirements + + use O_DIRECT when copying from /dev/zero too + + Add CONTRIBUTING file. + + Add the persistency to the volume created by iscsi IET. + + adding copy of v1 as v2 + + Moving contrib to cinder.api + + Moving api v1 implementation into v1 directory + + Switching api to use base extension manager + + moving all middleware code in cinder.api.middleware + + Moving common api code into cinder.api + + Cleaning up volume driver paths + + Add volume bootable information to api response + + Add XenAPINFSDriver + + Add db table for Glance Metadata + + Remove redundant db.volume_update() in volume manager create_volume() + + Pin pep8 1.3.3 + + Removes the xensm driver + + Pass in correct volume_ref to create_from_snapshot. + + Add hosts extension to Cinder. + + Remove unused python-daemon dependency + + Make tox.ini run pep8/hacking checks on bin. + + Various pep8/HACKING fixes for Cinder. + + Volume RPC API Versioning + + Remove gen_uuid() + + Remove obsolete use_local_volumes + + Import order cleanup per HACKING + + Remove unused volume API method - remove_from_compute() + + Scheduler API clean up and refactor + + Remove dm_setup(remove) call in volume_delete. + + Add ability to disable secure volume delete. + + Remove the zeroing out of the volume altogether + + Add 'create_volume' to scheduler RPC API. + + Fix run_tests.sh ambiguous usage msg and behaviour for -x option + + Add admin only action for force detach + + Changes bit mode of zadara.py to 644 + + Port openstack-common/uuidutils to Cinder + + Fix 401 from auth_token middleware + + Splitting out volume drivers in driver.py + + Minor optimization in create_volume in HpSanISCSIDriver + + Adding a SSH Connection Pool. + + Return volume type name on volume create + + pin sqlalchemy to the 0.7 series + + Add VolumeTenantAttribute API extension + + Log the body of an /action + + Detect and fix issues caused by vol ID migration + + Split out drivers in san.py + + Add VolumeHostAttribute API extension + + Add default volume type flag + + Fix typo so setting volume_tmp_dir works + + Rollback for resources during volume creation failure + + Allow the user to update a volume's metadata + + Add the generation of the username and password for iSCSI target. + + Update HACKING.rst and related changes from Nova/PEP8. + + Add trove classifiers for PyPI + + Ensure device node exists before wiping during volume deletion + + Update volume and snapshot status on delete + + Drop unused quota_usage db methods + + Drop duplicate sqlalchemy db api methods + + Change output strings to i18ned + + Adds support for Windows 2012 Storage Server + + Update common. + + Fix incorrect class path for legacycinder formatter in logging_sample.conf + + Error message references incorrect variable + + Loosen anyjson dependency to avoid clash with ceilometer + + Configuration Options clean up + + Fix typo in policy documentation + + Add snapshot force delete admin action + + Mock out sleep in some retry tests + + Use policy based rule to define context.is_admin + + Sync openstack common and add policy + + Fix typo in sample configuration file + + Update distribute version in test requires. + + Revert explicit usage of tgt-adm --conf option. + + Fixes remove_export for IetAdm + + Add missing entries in setup, fix up pip-requires + + Fix NetAppCmodeISCSIDriver._get_lun_handle() method + + Remove unused code: check_for_export. + + Return 400 if create volume snapshot force parameter is invalid + + Fix cinder-volume-usage-audit + + Sync with nova change I135ed85a. + + Remove cinder gating hack + + Set the default availability zone back to nova + + Add lun number (0) to model_update in HpSanDriver + + Fixes to the SolarisISCSI Driver + + Stop double logging to the console + + Restore SIGPIPE default action for subprocesses + + Replace builtin hash with MD5 to solve 32/64-bit issues. + + Correct IetAdm remove_iscsi_target + + Add nova migrate_version check to cinder import + + Bump version to 2013.1 + + Clean up db.volume_create() + + Fix volume deletion when device mapper is used + + Update quota when deleting volume that failed to be scheduled + + Sync a change to rpc from openstack-common. + + Add a resume delete on volume manager startup + + Improve entity validation in volumes APIs + + Add entity body validation helper + + Should've added super().tearDown() in test_iscsi + + Fixes bug 1050135. + + Fix FLAGS.volumes_dir help message + + Use tmpdir and avoid leaving test files behind + + Sync log format changes from openstack-common. + + Update rpc from openstack-common. + + Add volume quota in volume/api.py and olume/manager.py + + Fixes bug 1049446. + + Revert "Don't zero out snapshot volume on snapshot_delete" + + Add update to volume and snapshot controllers + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes 2013-04-17 23:12:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes 2013-04-29 14:08:52.000000000 +0200 @@ -2 +2 @@ -Mon Mar 25 13:24:38 UTC 2013 - dmueller(a)suse.com +Mon Apr 1 20:57:24 UTC 2013 - dmueller(a)suse.com @@ -4,3 +4,8 @@ -- add enable-nosetests.diff: - + Run the monkeypatch to be able to use nosetests directly - (backport of https://review.openstack.org/#/c/21685/) +- add sqlalchemy-update.diff: + + allow compatibility with SQLAlchemy 0.7.x + +------------------------------------------------------------------- +Wed Mar 27 13:58:14 UTC 2013 - dmueller(a)suse.com + +- update to 2013.1.rc3: + + rtslib is dropped again @@ -9 +14 @@ -Sun Mar 24 00:04:28 UTC 2013 - cloud-devel(a)suse.de +Tue Mar 26 12:30:37 UTC 2013 - opensuse-cloud(a)opensuse.org @@ -11,2 +16,2 @@ -- Update to version 2012.2.4+git.1364083468.db0595a: - + Backport paramiko 1.8.0 requirement to Folsom. +- Downgrade to version 2013.1.rc2: + + Revert from yesterday @@ -15 +20 @@ -Wed Mar 13 00:16:16 UTC 2013 - cloud-devel(a)suse.de +Mon Mar 25 09:37:25 UTC 2013 - cloud-devel(a)suse.de @@ -17,3 +22,29 @@ -- Update to version 2012.2.4+git.1363133776.ebcd4b7: - + Raise NotImplementedError for NFS snapshot operations - + Only use iscsi_helper config option if using ISCSIDriver +- Update to version 2013.2.a60.gd6935af: + + Clean up exec_dirs prefix from rootwrap conf + + Implement get_volume_stats in NFS driver + + Remove AGPL rtslib pkg from pip-requires. + + CoraidDriver: retrive volume info (improvement) + + Remove references to FLAGS from volume/manager.py + + Pull Oslo log fix to enable root logger initialization + + remove cinder-rtstool because of rtslib dep + + Allow snapshot_delete for NFS/GlusterFS drivers + + Fix Storwize/SVC LUN allocation with holes. + + Use OpenStack common project requires. + + Rename cinder-rtstool to rtstool + + Add snapshots to the volume usage audit report + + Speedup solidfire unit tests + + Add missing processutils for impl_zmq in oslo rpc + + Update Cinder's latest copy of OSLO grizzly stable + + Remove the log spam generated by the NetApp driver unit tests. + + Switch all uses of 422 response code to 400. + + Updates to OSAPI sizelimit middleware. + + Extend param2id() to work with uuids + + CoraidDriver: do not call login from __init__ + + CoraidDriver: typo in _login exception handler + + Fetch volume_types by uuid and not by name in v2 + + Snapshot reservation sync calls wrong resource. + + Fixed attach volume for EMC SMI-S iSCSI driver + + Last driver sync for Folsom and Grizzly + + Fixes Cinder REST API /volumes issue + + CoraidDriver: support users that are not admin + + Fixed shared gigabytes quota resource. @@ -22 +53 @@ -Thu Mar 7 08:29:01 UTC 2013 - vuntz(a)suse.com +Wed Mar 20 23:47:18 UTC 2013 - dmueller(a)suse.com @@ -24,4 +55,2 @@ -- Update cinder-config-update.diff: update etc/cinder/api-paste.ini - to have a signing_dir key under [filter:authtoken]. Otherwise, - cinder-api won't start. This was done with commit de289a6 in - Grizzly. +- the policy.json file link in tests was actually correct. remove + hack @@ -30 +59 @@ -Tue Mar 5 16:53:34 UTC 2013 - cloud-devel(a)suse.de +Mon Mar 18 09:30:36 UTC 2013 - speilicke(a)suse.com @@ -32,3 +61,24 @@ -- Update to version 2012.2.4+git.1362502414.95a620b: - + Check for non-default volume name template. - + Fix error for extra specs update with empty body. +- Update to version 2013.2.a7.g4c5f276: + + Fix typo in persona valid values + + Use self.configuration to support the multi-backend case + + Fixes dettach volumes in Windows cinder plugin +- Drop +git.$TIMESTAMP.$COMMITHASH version suffix + +-------------------------------------------------------------------- +Sun Mar 17 00:03:47 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.2.a95.g65e86b0+git.1363478627.65e86b0: + + Fix bugs for Huawei driver + + cinder-manage does not print any version information + + Count Snapshots towards volume/gigabyte quotas. + + Fix 3PAR driver hiding existing host error + + Fix ISCSIDriver rescan. + + Compression/tier capabilities for Storwize/SVC. + + Switch to final 1.1.0 oslo.config release + + Fix _migrate_up in test_migrations + + Bump version for Grizzly RC1 cut + +------------------------------------------------------------------- +Wed Mar 13 10:30:42 UTC 2013 - dmueller(a)suse.com + +- run migrations before starting the daemon @@ -37 +87 @@ -Fri Feb 22 10:08:07 UTC 2013 - cloud-devel(a)suse.de +Wed Mar 13 00:05:05 UTC 2013 - cloud-devel(a)suse.de @@ -39,2 +89,5 @@ -- Update to version 2012.2.4+git.1361527687.68de70d: - + Add a safe_minidom_parse_string function. (CVE-2013-1664) +- Update to version 2013.1.a79.g3f888b9+git.1363133105.3f888b9: + + update error log arguements in filter scheduler + + Storwize/SVC driver fix for multibackend scenario. + + Fix bad request response code on extra_specs create. + + Adds a flag to set glance api version to call @@ -43 +96 @@ -Thu Feb 7 18:29:05 UTC 2013 - dmueller(a)suse.com +Tue Mar 12 10:53:47 UTC 2013 - dmueller(a)suse.com @@ -45,3 +98 @@ -- Set auth_strategy to keystone for a good out-of-the-box experience -- Add cinder-config-update.diff: move configuration changes to a - patch, instead of using sed. +- python-oslo-config -> python-oslo.cofnig @@ -50 +101,41 @@ -Wed Feb 6 06:55:55 UTC 2013 - cloud-devel(a)suse.de +Tue Mar 12 00:12:26 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a72.g59a16a1+git.1363047146.59a16a1: + + Do not use prefix to lookup host in Storwize/SVC. + +------------------------------------------------------------------- +Mon Mar 11 16:06:12 UTC 2013 - dmueller(a)suse.com + +- add sqlalchemy-update.diff: + * Support SQLAlchemy 0.7.10 + +-------------------------------------------------------------------- +Mon Mar 11 12:59:59 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a70.g15cd9ac+git.1363006799.15cd9ac: + + Update oslo rpc libraries + +-------------------------------------------------------------------- +Mon Mar 11 09:55:39 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a68.g9f70ee5+git.1362995739.9f70ee5: + + Fixed copy image to volume and clone volume. + + Fixes issues found in /os-hosts API + + sync oslo changes for setup / version + + NetApp: Fix for snapshot not deleted in error state. + + Switch to oslo.config. + + Add get_volume_stats in the sheepdog driver. + + Fix 3PAR drivers to work in multi-backend mode. + + Fix Storwize/SVC storage_protocol reporting. + + Exit run_tests with the result code of the test runner. + + Use nose and openstack nose plugin. + + Mark configuration option netapp_password secret + + NetApp bug fix for multibackend scenario. + + Pull newly merged Olso update for 'is' operator + + Update tox.ini to support RHEL 6.x. + + Remove/update unused log arguements in manager + + Fix volume capacity reporting + + Removing flags in RBD in favor of configuration + + Fix calling setUp() method of superclass from tearDown method. + + Fix a few bugs for LeftHand Grizzly + + LIO iSCSI initiator ACL auto-config @@ -52,3 +143,166 @@ -- Update to version 2012.2.4+git.1360133755.a8caa79: - + Final versioning for 2012.2.3 - + Bump version to 2012.2.4 +-------------------------------------------------------------------- +Tue Mar 5 17:24:09 UTC 2013 - cloud-devel(a)suse.de + +- Update to version 2013.1.a33.g15962a4+git.1362504249.15962a4: + + Improved fail_reason for cinder-backup swift connection errors + + Elevate context for delete volume with no host. + + Only use iscsi_helper config option if using LVMISCSIDriver + + Add some useful log to filter scheduler. + + swift backup service checks version during restore + +-------------------------------------------------------------------- +Thu Feb 28 14:14:47 UTC 2013 - saschpe(a)suse.de + +- Update to version 2013.1.a23.gdd01069+git.1362060887.dd01069: + + allow run_tests.sh to report why it failed + + XenAPINFS: Fix Volume always uploaded as vhd/ovf + + Changed to INFO level logging for main cinder-backup operations + + Fixes the provisioning on selected volumes for NetApp 7 mode. + + Fix query filter in volume_get_active_by_window() + + NetApp: Fix race condition in 7-mode iSCSI driver with DFM. + + Improve logging for volume operations via manager + + Convert from using FLAGS directly in SF driver. + +------------------------------------------------------------------- +Tue Feb 26 17:15:30 UTC 2013 - dmueller(a)suse.com + +- add requires to python-rtslib + +------------------------------------------------------------------- +Mon Feb 25 10:35:33 UTC 2013 - saschpe(a)suse.de + +- Init script cleanup: ++++ 383 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes ++++ and /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes Old: ---- cinder-config-update.diff cinder-include-migratecfg.patch cinder-stable-folsom.tar.gz enable-nosetests.diff New: ---- cinder-stable-grizzly.tar.gz cinder-sudoers sqlalchemy-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-cinder-doc.spec ++++++ --- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200 @@ -19,20 +19,20 @@ %define component cinder Name: openstack-%{component}-doc -Version: 2012.2.4+git.1364083468.db0595a -Release: 1 -License: Apache-2.0 +Version: 2013.1 +Release: 0 Summary: OpenStack Block Storage (Cinder) - Documentation -Url: https://launchpad.net/cinder +License: Apache-2.0 Group: Documentation/HTML -Source: cinder-stable-folsom.tar.gz +Url: https://launchpad.net/cinder +Source: cinder-stable-grizzly.tar.gz BuildRequires: graphviz -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros BuildRequires: python-Paste BuildRequires: python-PasteDeploy BuildRequires: python-Routes -BuildRequires: python-Sphinx BuildRequires: python-SQLAlchemy +BuildRequires: python-Sphinx BuildRequires: python-WebOb BuildRequires: python-base BuildRequires: python-cinder = %{version} @@ -40,14 +40,15 @@ BuildRequires: python-distribute BuildRequires: python-eventlet BuildRequires: python-feedparser -BuildRequires: python-glanceclient +BuildRequires: python-glanceclient < 2 BuildRequires: python-iso8601 BuildRequires: python-ldap BuildRequires: python-lxml BuildRequires: python-mox +BuildRequires: python-oslo.config BuildRequires: python-paramiko -BuildRequires: python-suds BuildRequires: python-sqlalchemy-migrate +BuildRequires: python-suds BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,7 +59,7 @@ This package contains documentation files for %{name}. %prep -%setup -q -n cinder-2012.2.4 +%setup -q -n cinder-2013.1 %openstack_cleanup_prep %build ++++++ openstack-cinder.spec ++++++ --- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200 @@ -21,32 +21,38 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2012.2.4+git.1364083468.db0595a -Release: 1 -License: Apache-2.0 +Version: 2013.1 +Release: 0 Summary: OpenStack Block Storage (Cinder) -Url: https://launchpad.net/cinder +License: Apache-2.0 Group: System/Management -Source: cinder-stable-folsom.tar.gz +Url: https://launchpad.net/cinder +Source: cinder-stable-grizzly.tar.gz Source1: %{name}.init Source2: %{name}.logrotate -# PATCH-FIX-UPSTREAM: saschpe(a)suse.de - Backport of https://review.openstack.org/17347 -Patch0: cinder-include-migratecfg.patch -# PATCH-SUSE: dmueller(a)suse.de - Set sane defaults for SUSE -Patch1: cinder-config-update.diff -Patch2: enable-nosetests.diff +Source3: cinder-sudoers +Patch0: sqlalchemy-update.diff BuildRequires: fdupes -BuildRequires: openstack-macros +BuildRequires: openstack-suse-macros +BuildRequires: openstack-suse-sudo BuildRequires: python-base BuildRequires: python-distribute >= 0.6.24 +BuildRequires: python-oslo.config >= 1.1.0 # Documentation build requirements: +BuildRequires: openstack-utils BuildRequires: python-Sphinx -BuildRequires: python-eventlet BuildRequires: python-WebOb +BuildRequires: python-argparse +BuildRequires: python-eventlet >= 0.9.12 BuildRequires: python-iso8601 +BuildRequires: python-paramiko +BuildRequires: python-stevedore >= 0.8 Requires: logrotate +Requires: openstack-suse-sudo Requires: python >= 2.6.8 Requires: python-cinder = %{version} +Requires: python-oslo.config +Requires: python-swiftclient >= 1.2 %if 0%{?suse_version} > 1110 Requires(pre): pwdutils %else @@ -71,24 +77,26 @@ Group: Development/Languages/Python Requires: python >= 2.6.8 Requires: python-Paste -Requires: python-PasteDeploy +Requires: python-PasteDeploy >= 1.5.0 Requires: python-Routes Requires: python-SQLAlchemy >= 0.7.3 -Requires: python-WebOb -Requires: python-amqplib -Requires: python-anyjson +Requires: python-WebOb >= 1.0.8 +Requires: python-amqplib >= 0.6.1 +Requires: python-anyjson >= 0.2.4 Requires: python-eventlet >= 0.9.17 Requires: python-glanceclient >= 0.5.0 Requires: python-greenlet >= 0.3.1 Requires: python-iso8601 >= 0.1.4 -Requires: python-kombu +Requires: python-keystoneclient >= 0.2.0 +Requires: python-kombu >= 1.0.4 Requires: python-lockfile Requires: python-lxml >= 2.3 -Requires: python-paramiko +Requires: python-paramiko >= 1.8.0 Requires: python-python-daemon Requires: python-sqlalchemy-migrate >= 0.7.2 -Requires: python-suds -Requires: python-wsgiref +Requires: python-stevedore >= 0.8 +Requires: python-suds >= 0.4 +Requires: python-wsgiref >= 0.1.2 %description -n python-cinder Cinder is the OpenStack Block storage service. This is a spin out of @@ -104,6 +112,14 @@ %description api This package contains the OpenStack Cinder API. +%package backup +Summary: OpenStack Block Storage (Cinder) - Volume Backup Service +Group: Development/Languages/Python +Requires: %{name} = %{version} + +%description backup +This package contains the OpenStack Cinder Backup Service. + %package scheduler Summary: OpenStack Block Storage (Cinder) - Scheduler Group: Development/Languages/Python @@ -116,6 +132,8 @@ Summary: OpenStack Block Storage (Cinder) - Volume Group: Development/Languages/Python Requires: %{name} = %{version} +Provides: openstack-nova-volume = 2013.1 +Obsoletes: openstack-nova-volume < 2013.1 %description volume This package contains the OpenStack Cinder volume manager. @@ -125,12 +143,15 @@ Group: Development/Languages/Python Requires: %{name} = %{version} Requires: git-core >= 1.6.4 -Requires: python-pylint Requires: python-WebTest -Requires: python-coverage +Requires: python-amqp >= 1.0.5 Requires: python-cinderclient +Requires: python-coverage +Requires: python-glanceclient < 2 +Requires: python-hp3parclient >= 1.0.0 Requires: python-httplib2 Requires: python-ldap +Requires: python-mock Requires: python-mox Requires: python-netifaces Requires: python-nose @@ -138,6 +159,7 @@ Requires: python-nosexcover Requires: python-openstack.nose_plugin Requires: python-pep8 +Requires: python-pylint Requires: python-python-memcached Requires: python-unittest2 @@ -146,25 +168,23 @@ functionality of OpenStack Cinder. %prep -%setup -q -n cinder-2012.2.4 -%patch0 -p1 -%patch1 -%patch2 +%setup -q -n cinder-2013.1 +%patch0 %openstack_cleanup_prep -# FIXME: Fix path to test/policy.json due to our special test setup -# maybe the code in cinder/utils.py#find_config could be fixed, too: -# ConfigNotFound: Could not find config at /usr/lib64/python2.6/site-packages/cinder/tests/cinder/tests/policy.json -sed -i "s|cinder\/tests\/policy.json|policy.json|" ./cinder/tests/fake_flags.py +# NOTE(saschpe): We don't build i18n message catalogs, thus: +sed -i -e "s|Babel.*||" tools/pip-requires +# NOTE(saschpe): We don't use setuptools.git, we use git(hub)_tarballs source service: +sed -i -e "s|setuptools_git>=0.4||" tools/pip-requires %build python setup.py build -%openstack_sphinx_build_manpages_only +python setup.py build_sphinx -b man %install python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} ### directories -install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component} +install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log,run}/%{component} install -d -m 755 %{buildroot}%{_sysconfdir}/%{component} ### configuration files @@ -177,16 +197,15 @@ ### init scripts mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_initddir} -for i in api volume scheduler ; do - tmp=$(mktemp) - cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp - if [ "x$i" = "xcompute" ] ; then - sed -i -e "s/# Should-Start:.*/& libvirtd/" $tmp - fi - install -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i +for i in api backup scheduler volume ; do + install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/%{name}-$i + sed -i -e "s/__NAME__/$i/g" %{buildroot}%{_initddir}/%{name}-$i ln -s ../..%{_initddir}/%{name}-$i %{buildroot}%{_sbindir}/rc%{name}-$i done +### sudoers configuration for cinder-rootwrap: +install -D -m 440 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudoers.d/openstack-cinder + ### documentation install -d %{buildroot}%{_mandir}/man1 install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1 @@ -198,9 +217,22 @@ ### misc %fdupes %{buildroot}%{python_sitelib}/%{component} +### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar) +%define cinder_conf %{buildroot}%{_sysconfdir}/cinder/cinder.conf +openstack-config --set %{cinder_conf} DEFAULT verbose True +#NOTE(saschpe): Don't set 'log_file', each cinder deamon will create it's own if only 'log_dir' is set: +openstack-config --set %{cinder_conf} DEFAULT log_dir /var/log/cinder +openstack-config --set %{cinder_conf} DEFAULT auth_strategy keystone +openstack-config --set %{cinder_conf} DEFAULT rootwrap_config /etc/cinder/rootwrap.conf +openstack-config --set %{cinder_conf} DEFAULT state_path /var/lib/cinder +#NOTE(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? +openstack-config --set %{cinder_conf} DEFAULT sql_connection sqlite:////var/lib/cinder/cinder.db +#NOTE(saschpe): Can't hurt to set the default volume_group, only the LVM driver has a it otherwise: +openstack-config --set %{cinder_conf} DEFAULT volume_group cinder-volumes + %pre getent group %{groupname} >/dev/null || groupadd -r %{groupname} -getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Cinder" %{username} +getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Cinder Daemons" %{username} exit 0 %post api @@ -213,6 +245,15 @@ %restart_on_update %{name}-api %insserv_cleanup +%post backup + +%preun backup +%stop_on_removal %{name}-backup + +%postun backup +%restart_on_update %{name}-backup +%insserv_cleanup + %post scheduler %{fillup_and_insserv -f %{name}-scheduler} @@ -236,15 +277,17 @@ %files %defattr(-,root,root) %doc LICENSE README.rst -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component} +%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component} +%ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/%{component} %dir %{_sysconfdir}/%{component} -%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/api-paste.ini -%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/%{component}.conf -%config(noreplace) %{_sysconfdir}/%{component}/policy.json -%config(noreplace) %{_sysconfdir}/%{component}/rootwrap.conf %dir %{_sysconfdir}/%{component}/rootwrap.d -%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/%{component} -%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/%{component} +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%config %{_sysconfdir}/sudoers.d/openstack-cinder +%config %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/api-paste.ini +%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/%{component}.conf +%config %{_sysconfdir}/%{component}/policy.json +%config %{_sysconfdir}/%{component}/rootwrap.conf %{_bindir}/%{component}-all %{_bindir}/%{component}-clear-rabbit-queues %{_bindir}/%{component}-manage @@ -265,6 +308,13 @@ %{_sbindir}/rc%{name}-api %{_bindir}/%{component}-api +%files backup +%defattr(-,root,root,-) +%doc LICENSE +%{_initddir}/%{name}-backup +%{_sbindir}/rc%{name}-backup +%{_bindir}/%{component}-backup + %files scheduler %defattr(-,root,root,-) %doc LICENSE @@ -275,7 +325,7 @@ %files volume %defattr(-,root,root,-) %doc LICENSE -%config(noreplace) %{_sysconfdir}/%{component}/rootwrap.d/volume.filters +%config %{_sysconfdir}/%{component}/rootwrap.d/volume.filters %{_initddir}/%{name}-volume %{_sbindir}/rc%{name}-volume %{_bindir}/%{component}-volume ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200 @@ -1,6 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/cinder/cinder-stable-folsom.tar.gz</param> - <param name="email">cloud-devel(a)suse.de</param> + <param name="url">http://tarballs.openstack.org/cinder/cinder-stable-grizzly.tar.gz</param> + <param name="email">opensuse-cloud(a)opensuse.org</param> + <param name="plain-version">True</param> </service> </services> ++++++ cinder-sudoers ++++++ openstack-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * ++++++ openstack-cinder.init ++++++ --- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200 @@ -2,86 +2,75 @@ ### BEGIN INIT INFO # Provides: openstack-cinder-__NAME__ -# Required-Start: $network $remote_fs $syslog +# Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog -# Should-Start: rabbitmq-server mysql postgresql -# Should-Stop: rabbitmq-server mysql postgresql +# Should-Start: mysql postgresql rabbitmq-server +# Should-Stop: mysql postgresql rabbitmq-server # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: Cinder __NAME__ server -# Description: Cinder __NAME__ server. +# Short-Description: OpenStack Block Storage (Cinder) - __NAME__ +# Description: OpenStack Block Storage (Cinder) - __NAME__ ### END INIT INFO -name="__NAME__" +DAEMON="__NAME__" USER="openstack-cinder" -GROUP="nobody" -CONFIGFILE="/etc/cinder/cinder.conf" +CONFFILE="/etc/cinder/cinder.conf" RUNDIR="/var/run/cinder" -LOGFILE="/var/log/cinder/$name.log" -[ -e "/etc/sysconfig/openstack-cinder-$name" ] && . "/etc/sysconfig/openstack-cinder-$name" +# $RUNDIR can be tmpfs, thus we have to create/own it here: +mkdir -p $RUNDIR && chown $USER. $RUNDIR -[ -e $LOGFILE ] || touch $LOGFILE -mkdir -p $RUNDIR -chown $USER. $RUNDIR $LOGFILE - -DAEMON_OPTIONS="--config-file=$CONFIGFILE --log-file=$LOGFILE" -OPTIONS="${OPTIONS} $DAEMON_OPTIONS" - -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v be verbose in local rc status and clear it afterwards -# rc_status -v -r ditto and clear both the local and overall rc status -# rc_status -s display "skipped" and exit with status 3 -# rc_status -u display "unused" and exit with status 3 -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num> -# rc_reset clear both the local and overall rc status -# rc_exit exit appropriate to overall rc status -# rc_active checks whether a service is activated by symlinks . /etc/rc.status -FULLNAME="OpenStack::Cinder $name server" -CHUSER="-u $USER" - case "$1" in start) - echo -n "Starting $FULLNAME" - startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/cinder-$name $OPTIONS + echo -n "Checking for DB Migrations" + /usr/bin/cinder-manage db sync + rc_status -v + + echo -n "Starting cinder-$DAEMON" + /sbin/startproc -q -s -u $USER /usr/bin/cinder-$DAEMON --config-file=$CONFFILE rc_status -v ;; stop) - echo -n "Shutting down $FULLNAME" - killproc /usr/bin/cinder-$name + echo -n "Shutting down cinder-$DAEMON" + /sbin/killproc /usr/bin/cinder-$DAEMON rc_status -v ;; restart) $0 stop - $0 start - rc_status + $0 start + rc_status + ;; + force-reload) + $0 try-restart + rc_status ;; reload) + echo -n "Reload service cinder-$DAEMON" + rc_failed 3 + rc_status -v ;; status) - echo -n "Checking $FULLNAME" - /sbin/checkproc /usr/bin/cinder-$name - rc_status -v - ;; - condrestart|try-restart) - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - rc_status - ;; + echo -n "Checking for service cinder-$DAEMON" + /sbin/checkproc /usr/bin/cinder-$DAEMON + rc_status -v + ;; + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset # Not running is not a failure. + fi + rc_status # Remember status and be quiet + ;; *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" - exit 2 + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" + exit 1 + ;; esac -exit $? +rc_exit ++++++ openstack-cinder.logrotate ++++++ --- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200 @@ -1,5 +1,13 @@ +compress + /var/log/cinder/*.log { - daily + rotate 15 + size 1M + weekly + dateext missingok + notifyempty su openstack-cinder openstack-cinder + copytruncate + sharedscripts } ++++++ sqlalchemy-update.diff ++++++ --- cinder.egg-info/requires.txt +++ cinder.egg-info/requires.txt @@ -1,4 +1,4 @@ -SQLAlchemy>=0.7.3,<=0.7.9 +SQLAlchemy>=0.7.3,<=0.7.99 amqplib>=0.6.1 anyjson>=0.2.4 eventlet>=0.9.17 @@ -21,4 +21,4 @@ python-glanceclient>=0.5.0,<2 python-keystoneclient>=0.2.0 python-swiftclient -oslo.config>=1.1.0 \ No newline at end of file +oslo.config>=1.1.0 --- tools/pip-requires +++ tools/pip-requires @@ -1,4 +1,4 @@ -SQLAlchemy>=0.7.3,<=0.7.9 +SQLAlchemy>=0.7.3,<=0.7.99 amqplib>=0.6.1 anyjson>=0.2.4 argparse -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nodejs for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package nodejs for openSUSE:Factory checked in at 2013-04-29 14:08:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs (Old) and /work/SRC/openSUSE:Factory/.nodejs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs", Maintainer is "JMassaguerPla(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs/nodejs.changes 2013-04-23 15:17:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs.new/nodejs.changes 2013-04-29 14:08:08.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 25 18:33:51 UTC 2013 - adaugherity(a)tamu.edu + +- update to 0.10.5 + +------------------------------------------------------------------- +Thu Apr 25 18:12:39 UTC 2013 - adaugherity(a)tamu.edu + +- rebase 0.10.4 build/patches against current OBS state + +------------------------------------------------------------------- @@ -18,0 +29,32 @@ + +------------------------------------------------------------------- +Fri Apr 19 20:05:20 UTC 2013 - adaugherity(a)tamu.edu + +- make v8 version deps explicit, and add more provides (copied from Fedora) + +This will require manually updating the nodejs pkg whenever there's a +minor version bump in v8 (3.x to 3.y, not micro, i.e. 3.x.a to 3.x.b), +but that's better than v8 updates breaking existing nodejs installations. + +------------------------------------------------------------------- +Thu Apr 18 23:31:58 UTC 2013 - adaugherity(a)tamu.edu + +- Fix build on platforms w/openssl 0.9.8 (e.g. SLES 11). +- Fix -devel subpkg -- manually install headers (copied from Fedora), + and move dtrace and share to -devel subpkg. + + NodeJS <= 0.8 installed headers itself, so this was not previously + necessary. + + NB: Fedora uses an external libuv pkg, but we don't, so we must + also copy libuv headers. + +------------------------------------------------------------------- +Thu Apr 18 14:23:49 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.10.4: + + See https://raw.github.com/joyent/node/v0.10.4/ChangeLog +- Delete no longer needed patches: + + node-v0.8.12_missing_include.patch + + nodejs-devel-lib64path.patch + + nodejs-no-v8-headers.patch +- Rebase nodejs-lib64path.patch and nodejs-libpath.patch. +- Add nodejs-v8-3.18.0.patch: make node.js compatible to V8 3.18.0. Old: ---- node-v0.8.12_missing_include.patch node-v0.8.23.tar.gz nodejs-devel-lib64path.patch nodejs-no-v8-headers.patch nodejs-v8-deprecated-api.patch New: ---- node-v0.10.5.tar.gz nodejs-v8-3.18.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs.spec ++++++ --- /var/tmp/diff_new_pack.AeDhzD/_old 2013-04-29 14:08:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AeDhzD/_new 2013-04-29 14:08:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: nodejs -Version: 0.8.23 +Version: 0.10.5 Release: 0 Summary: Evented I/O for V8 JavaScript License: MIT @@ -25,22 +25,23 @@ Url: http://www.nodejs.org Source: http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz Patch0: nodejs-lib64path.patch -Patch1: nodejs-devel-lib64path.patch Patch2: nodejs-libpath.patch -Patch3: node-v0.8.12_missing_include.patch Patch4: node-gyp-addon-gypi.patch -Patch5: nodejs-no-v8-headers.patch +Patch5: nodejs-v8-3.18.0.patch Patch6: nodejs-openssl-missing-api.patch -Patch7: nodejs-v8-deprecated-api.patch BuildRequires: curl BuildRequires: gcc-c++ BuildRequires: procps -%if 0%{?suse_version} == 1140 -BuildRequires: v8-devel >= 3.7 -%else -BuildRequires: v8-devel >= 3.15.3 -%endif -Requires: %(rpm -q --requires v8-devel | grep libv8) +# V8 presently breaks ABI at least every x.y release while never bumping SONAME, +# so we need to be more explicit. v8_ge may be specified as e.g. +# major.minor.micro-release if necessary. +%global v8_ge 3.18 +%global v8_lt 3.19 +%global v8_abi 3.18 +BuildRequires: v8-devel >= %{v8_ge} +Requires: v8%{?isa} < %{v8_lt} +Requires: v8%{?isa} >= %{v8_ge} + BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: libopenssl-devel @@ -48,11 +49,19 @@ BuildRequires: openssl-devel %endif BuildRequires: pkg-config -BuildRequires: zlib-devel -# for waf BuildRequires: python +BuildRequires: zlib-devel Provides: npm = %{version} Obsoletes: npm <= 1.0.999 +#we need ABI virtual provides where SONAMEs aren't enough/not present so deps +#break when binary compatibility is broken +%global nodejs_abi 0.10 +Provides: nodejs(abi) = %{nodejs_abi} +Provides: nodejs(v8-abi) = %{v8_abi} + +#this corresponds to the "engine" requirement in package.json +Provides: nodejs(engine) = %{version} + #building nodejs makes sense only on v8 archs ExclusiveArch: %{ix86} x86_64 %{arm} @@ -75,22 +84,14 @@ %setup -q -n node-v%{version} %if %{_lib} == "lib64" %patch0 -p1 -%patch1 %else -%patch2 +%patch2 -p1 %endif -%patch3 -cd deps/npm/node_modules/node-gyp +(cd deps/npm/node_modules/node-gyp %patch4 -p1 -cd - -%patch5 +) +%patch5 -p1 %patch6 - -%if 0%{?suse_version} != 1140 -# nodejs-v8-deprecated-api.patch, only for nodejs 0.8 with v8 >= 3.15.3. -%patch7 -%endif - # Make sure nothing gets included from bundled deps: # We only delete the source and header files, because # the remaining build scripts are still used. @@ -113,6 +114,15 @@ %install %{?make_install} %{!?make_install:make install DESTDIR=$RPM_BUILD_ROOT} +# npm man page +cp -p deps/npm/man/man1/npm.1 %{buildroot}/%{_mandir}/man1 +#install development headers +#FIXME: we probably don't really need *.h but node-gyp downloads the whole +#freaking source tree so I can't be sure ATM +mkdir -p %{buildroot}%{_includedir}/node +cp -p src/*.h %{buildroot}%{_includedir}/node +cp -pR deps/uv/include/* %{buildroot}%{_includedir}/node + #node-gyp needs common.gypi too mkdir -p %{buildroot}%{_datadir}/node cp -p common.gypi %{buildroot}%{_datadir}/node @@ -120,21 +130,15 @@ %files %defattr(-, root, root) %{_bindir}/node -%{_mandir}/*/* -%{_libdir}/dtrace -%{_datadir}/node -#npm -%doc AUTHORS LICENSE +%{_bindir}/npm %{_libdir}/node_modules -%exclude %{_libdir}/node_modules/npm/.npmignore -%attr(755,root,root) %{_bindir}/npm -%attr(755,root,root) %{_libdir}/node_modules/npm/scripts/clean-old.sh -%attr(755,root,root) %{_libdir}/node_modules/npm/scripts/install.sh +%{_mandir}/man1/* +%doc AUTHORS LICENSE %files devel %defattr(-, root, root) -%{_bindir}/node-waf %{_includedir}/node -%{_libdir}/node +%{_libdir}/dtrace +%{_datadir}/node %changelog ++++++ node-v0.8.23.tar.gz -> node-v0.10.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/nodejs/node-v0.8.23.tar.gz /work/SRC/openSUSE:Factory/.nodejs.new/node-v0.10.5.tar.gz differ: char 5, line 1 ++++++ nodejs-lib64path.patch ++++++ --- /var/tmp/diff_new_pack.AeDhzD/_old 2013-04-29 14:08:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AeDhzD/_new 2013-04-29 14:08:12.000000000 +0200 @@ -1,37 +1,21 @@ -diff -urN node-v0.8.18/lib/module.js node-v0.8.18-patch/lib/module.js ---- node-v0.8.18/lib/module.js 2013-01-18 22:15:41.000000000 +0200 -+++ node-v0.8.18-patch/lib/module.js 2013-01-25 08:26:59.000000000 +0200 -@@ -493,7 +493,7 @@ - }; +Index: node-v0.10.4/lib/module.js +=================================================================== +--- node-v0.10.4.orig/lib/module.js ++++ node-v0.10.4/lib/module.js +@@ -508,7 +508,7 @@ Module._initPaths = function() { + var homeDir = process.env.HOME; + } - Module._initPaths = function() { - var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')]; + var paths = ["/usr/lib/node", "/usr/lib64/node"]; - if (process.env['HOME']) { - paths.unshift(path.resolve(process.env['HOME'], '.node_libraries')); -diff -urN node-v0.8.18/tools/install.py node-v0.8.18-patch/tools/install.py ---- node-v0.8.18/tools/install.py 2013-01-18 22:15:41.000000000 +0200 -+++ node-v0.8.18-patch/tools/install.py 2013-01-25 08:26:59.000000000 +0200 -@@ -97,7 +97,7 @@ - 'tools/wafadmin/TaskGen.py', - 'tools/wafadmin/Task.py', - 'tools/wafadmin/Utils.py'], -- 'lib/node/wafadmin/') -+ 'lib64/node/wafadmin/') - action(['tools/wafadmin/Tools/ar.py', - 'tools/wafadmin/Tools/cc.py', - 'tools/wafadmin/Tools/ccroot.py', -@@ -131,7 +131,7 @@ - 'tools/wafadmin/Tools/winres.py', - 'tools/wafadmin/Tools/xlc.py', - 'tools/wafadmin/Tools/xlcxx.py'], -- 'lib/node/wafadmin/Tools/') -+ 'lib64/node/wafadmin/Tools/') - - def update_shebang(path, shebang): - print 'updating shebang of %s to %s' % (path, shebang) -@@ -140,7 +140,7 @@ + if (homeDir) { + paths.unshift(path.resolve(homeDir, '.node_libraries')); +Index: node-v0.10.4/tools/install.py +=================================================================== +--- node-v0.10.4.orig/tools/install.py ++++ node-v0.10.4/tools/install.py +@@ -86,7 +86,7 @@ def update_shebang(path, shebang): open(path, 'w').write(s) def npm_files(action): @@ -40,7 +24,7 @@ # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there -@@ -158,7 +158,7 @@ +@@ -104,7 +104,7 @@ def npm_files(action): if action == uninstall: action([link_path], 'bin/npm') elif action == install: @@ -49,7 +33,7 @@ if os.environ.get('PORTABLE'): # This crazy hack is necessary to make the shebang execute the copy # of node relative to the same directory as the npm script. The precompiled -@@ -201,7 +201,7 @@ +@@ -124,7 +124,7 @@ def files(action): # install unconditionally, checking if the platform supports dtrace doesn't # work when cross-compiling and besides, there's at least one linux flavor # with dtrace support now (oracle's "unbreakable" linux) ++++++ nodejs-libpath.patch ++++++ --- /var/tmp/diff_new_pack.AeDhzD/_old 2013-04-29 14:08:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AeDhzD/_new 2013-04-29 14:08:12.000000000 +0200 @@ -1,11 +1,13 @@ ---- ../node-v0.4.11.original/lib/module.js 2011-08-17 18:18:10.000000000 -0700 -+++ lib/module.js 2011-08-22 14:36:11.662283878 -0700 -@@ -422,7 +422,7 @@ - }; +Index: node-v0.10.4/lib/module.js +=================================================================== +--- node-v0.10.4.orig/lib/module.js ++++ node-v0.10.4/lib/module.js +@@ -508,7 +508,7 @@ Module._initPaths = function() { + var homeDir = process.env.HOME; + } - Module._initPaths = function() { - var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')]; + var paths = ["/usr/lib/node"]; - if (process.env['HOME']) { - paths.unshift(path.resolve(process.env['HOME'], '.node_libraries')); + if (homeDir) { + paths.unshift(path.resolve(homeDir, '.node_libraries')); ++++++ nodejs-openssl-missing-api.patch ++++++ --- /var/tmp/diff_new_pack.AeDhzD/_old 2013-04-29 14:08:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AeDhzD/_new 2013-04-29 14:08:12.000000000 +0200 @@ -1,14 +1,97 @@ -index fe43359..2c8a557 100644 ---- src/node_crypto.h -+++ src/node_crypto.h -@@ -43,6 +43,10 @@ +NodeJS 0.10 uses APIs introduced with OpenSSL 1.0.0. To make it build against +OpenSSL 0.9.8 we must revert some API changes (298f6bf) and copy some missing +structs/functions from OpenSSL 1.0.0. + +A better long-term solution might be to have the RPM depend on openssl>=1.0.0 +and statically link with the bundled OpenSSL on platforms lacking it. +--- src/node_crypto.cc.orig 2013-04-18 14:27:08.000000000 -0500 ++++ src/node_crypto.cc 2013-04-18 17:37:52.000000000 -0500 +@@ -84,8 +84,13 @@ + static uv_rwlock_t* locks; - #define EVP_F_EVP_DECRYPTFINAL 101 -+#if OPENSSL_VERSION_NUMBER <= 0x009080afL -+# define EVP_PKEY_id(pkey) ((pkey)->type) ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L + static void crypto_threadid_cb(CRYPTO_THREADID* tid) { + CRYPTO_THREADID_set_numeric(tid, uv_thread_self()); ++#else ++static unsigned long crypto_id_cb(void) { ++ return (unsigned long) pthread_self(); +#endif + } + + +@@ -3996,6 +4001,62 @@ + arr->Set(arr->Length(), String::New(from)); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10000000L ++/* Missing structs & functions copied from openssl-1.0.0 evp/names.c, with ++ * explicit casts added to make the C++ compiler happy. ++ */ ++extern "C" { ++struct doall_cipher ++ { ++ void *arg; ++ void (*fn)(const EVP_CIPHER *ciph, ++ const char *from, const char *to, void *arg); ++ }; ++ ++static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg) ++ { ++ struct doall_cipher *dc = (doall_cipher *)arg; ++ if (nm->alias) ++ dc->fn(NULL, nm->name, nm->data, dc->arg); ++ else ++ dc->fn((const EVP_CIPHER *)nm->data, nm->name, NULL, dc->arg); ++ } ++ ++void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, ++ const char *from, const char *to, void *x), void *arg) ++ { ++ struct doall_cipher dc; ++ dc.fn = fn; ++ dc.arg = arg; ++ OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn,&dc); ++ } ++ ++struct doall_md ++ { ++ void *arg; ++ void (*fn)(const EVP_MD *ciph, ++ const char *from, const char *to, void *arg); ++ }; + ++static void do_all_md_fn(const OBJ_NAME *nm, void *arg) ++ { ++ struct doall_md *dc = (doall_md *)arg; ++ if (nm->alias) ++ dc->fn(NULL, nm->name, nm->data, dc->arg); ++ else ++ dc->fn((const EVP_MD *)nm->data, nm->name, NULL, dc->arg); ++ } ++ ++void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md, ++ const char *from, const char *to, void *x), void *arg) ++ { ++ struct doall_md dc; ++ dc.fn = fn; ++ dc.arg = arg; ++ OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc); ++ } ++} ++#endif + + Handle<Value> GetCiphers(const Arguments& args) { + HandleScope scope; +@@ -4024,7 +4085,11 @@ + + crypto_lock_init(); + CRYPTO_set_locking_callback(crypto_lock_cb); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L + CRYPTO_THREADID_set_callback(crypto_threadid_cb); ++#else ++ CRYPTO_set_id_callback(crypto_id_cb); ++#endif - namespace node { - namespace crypto { + // Turn off compression. Saves memory - do it in userland. + #if !defined(OPENSSL_NO_COMP) ++++++ nodejs-v8-deprecated-api.patch -> nodejs-v8-3.18.0.patch ++++++ ++++ 1111 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/nodejs/nodejs-v8-deprecated-api.patch ++++ and /work/SRC/openSUSE:Factory/.nodejs.new/nodejs-v8-3.18.0.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mupdf for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package mupdf for openSUSE:Factory checked in at 2013-04-29 14:07:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mupdf (Old) and /work/SRC/openSUSE:Factory/.mupdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mupdf", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mupdf/mupdf.changes 2013-04-09 07:08:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mupdf.new/mupdf.changes 2013-04-29 14:07:18.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 28 10:28:56 UTC 2013 - dap.darkness(a)gmail.com + +- Fixed "ld: relocation R_X86_64_32 against `.rodata' can not + be used when making a shared object; recompile with -fPIC". + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mupdf.spec ++++++ --- /var/tmp/diff_new_pack.4zKxus/_old 2013-04-29 14:07:20.000000000 +0200 +++ /var/tmp/diff_new_pack.4zKxus/_new 2013-04-29 14:07:20.000000000 +0200 @@ -65,6 +65,7 @@ rm -rf thirdparty %build +export CFLAGS="%{optflags} -fPIC" export XCFLAGS="%{optflags}" make %{?_smp_mflags} verbose=1 ls -1 build/debug -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmwaw for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package libmwaw for openSUSE:Factory checked in at 2013-04-29 14:04:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmwaw (Old) and /work/SRC/openSUSE:Factory/.libmwaw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmwaw", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libmwaw/libmwaw.changes 2013-04-03 13:01:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmwaw.new/libmwaw.changes 2013-04-29 14:04:49.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Apr 28 13:44:00 UTC 2013 - fridrich.strba(a)suse.com + +- Upgrade to upstream 0.1.8 + - Several improvements in different parsers + +------------------------------------------------------------------- +Sat Apr 20 12:08:23 UTC 2013 - tchvatal(a)suse.com + +- Use download URL path. + +------------------------------------------------------------------- Old: ---- libmwaw-0.1.7.tar.xz New: ---- libmwaw-0.1.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmwaw.spec ++++++ --- /var/tmp/diff_new_pack.2h0hSE/_old 2013-04-29 14:04:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2h0hSE/_new 2013-04-29 14:04:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libmspub +# spec file for package libmwaw # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,10 +35,10 @@ Summary: Pre Mac OSX text file formats parser library License: (LGPL-2.1+ or MPL-2.0) and GPL-2.0+ Group: Productivity/Publishing/Word -Version: 0.1.7 +Version: 0.1.8 Release: 0 Url: http://sourceforge.net/p/libmwaw/wiki/Home/ -Source: libmwaw-%{version}.tar.xz +Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}… BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ libmwaw-0.1.7.tar.xz -> libmwaw-0.1.8.tar.xz ++++++ ++++ 12541 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcaes for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package libcaes for openSUSE:Factory checked in at 2013-04-29 14:04:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcaes (Old) and /work/SRC/openSUSE:Factory/.libcaes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcaes", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-04-05 00:01:41.916011506 +0200 +++ /work/SRC/openSUSE:Factory/.libcaes.new/libcaes.changes 2013-04-29 14:04:15.000000000 +0200 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Fri Apr 5 20:08:25 UTC 2013 - jengelh(a)inai.de + +- Initial package (version 0~20130331) for build.opensuse.org New: ---- libcaes-alpha-20130331.tar.xz libcaes.changes libcaes.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcaes.spec ++++++ # # spec file for package libcaes # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libcaes %define lname libcaes1 %define timestamp 20130331 Version: 0~%timestamp Release: 0 License: LGPL-3.0+ Summary: Library for cross-platform AES encryption Group: Development/Libraries/C and C++ Url: http://code.google.com/p/libcaes/ #Git-Clone: http://code.google.com/p/libcaes #DL-URL: http://libcaes.googlecode.com/files/libcaes-alpha-20130331.tar.gz Source: %name-alpha-%timestamp.tar.xz BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(libcerror) >= 20120425 #BuildRequires: pkgconfig(libcstring) >= 20120425 BuildRequires: pkgconfig(openssl) >= 1.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libcaes is a library for cross-platform AES encryption. %package -n %lname Summary: Library for cross-platform AES encryption Group: System/Libraries %description -n %lname libcaes is a library for cross-platform AES encryption. %package devel Summary: Development files for libcaes, a cross-platform AES encryption library Group: Development/Libraries/C and C++ Requires: %lname = %version %description devel libcaes is a library for cross-platform AES encryption. This subpackage contains libraries and header files for developing applications that want to make use of libcaes. %prep %setup -qn libcaes-%timestamp %build %configure --disable-static --enable-wide-character-type make %{?_smp_mflags} %install make install DESTDIR="%buildroot" rm -f "%buildroot/%_libdir"/*.la %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog %_libdir/libcaes.so.1* %files devel %defattr(-,root,root) %_includedir/libcaes* %_libdir/libcaes.so %_libdir/pkgconfig/libcaes.pc %_mandir/man3/libcaes.3* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-04-29 13:59:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-04-22 14:31:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-04-29 13:59:02.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Apr 26 15:32:44 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Remove plasma-notifications-kill-timer.diff, that was fix for + kde#230740, but it is commited upstream 3 years ago +- Remove unused patches: kwin-suse.diff, kdm-audit-log.diff, + systemsettings-root-kcm.diff, pam-translate.diff and + kdm-suspend-hal.diff (which used HAL, but we migrated away from + it long ago) +- Group patches wheter they are for KDM or Workspace components +- Remove checks and obsoletes/provides for no longer supported versions +- Fix rpmlint warnings: devel files shipping in the main package and + kdm missing logrotate dependency +- Remove not needed kdesud %verify checks +- Added %kde4_runtime_requires to ksysguard and plasma-calendar packages +- Annotate existing patches where possible + +------------------------------------------------------------------- Old: ---- kdm-audit-log.diff kdm-suspend-hal.diff kwin-suse.diff pam-translate.diff plasma-notifications-kill-timer.diff systemsettings-root-kcm.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.zXH9ov/_old 2013-04-29 13:59:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zXH9ov/_new 2013-04-29 13:59:08.000000000 +0200 @@ -32,11 +32,7 @@ %if !%{with_systemd} BuildRequires: ConsoleKit-devel %endif -%if 0%{?suse_version} > 1140 BuildRequires: NetworkManager-devel > 0.8.997 -%else -BuildRequires: NetworkManager-devel < 0.8.5 -%endif BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: libQtWebKit-devel @@ -45,9 +41,7 @@ BuildRequires: libkde4-devel >= %{version} BuildRequires: libkdepimlibs4-devel >= %{version} BuildRequires: liblazy-devel -%if %suse_version > 1110 BuildRequires: libpolkit-qt-1-devel -%endif BuildRequires: libprison-devel BuildRequires: libqalculate-devel BuildRequires: libqimageblitz-devel @@ -79,85 +73,92 @@ Source6: kdm-logrotate Source7: ksysguardd.service Source91: %{name}-rpmlintrc -Patch8: kwin-suse.diff -Patch18: startkde.diff -Patch60: kdm-audit-log.diff -Patch62: kdm-cope-with-new-grub.diff -Patch63: kdm-relaxed-auth.diff -Patch64: kdm-suspend-hal.diff -%if %suse_version > 1210 -Patch65: kdm-sysconfig-values.diff -%endif -Patch66: kdm-wordbreak.diff -Patch67: kdm-remove-duplicated-sessions.diff -Patch68: kdm-make_it_cool.diff -Patch69: kdm-all-users-nopass.diff -Patch70: same-pam-generic-classic.diff -Patch71: kdm-kdmconf.diff -Patch77: systemsettings-desktop.diff -Patch82: rotate-wacom-pointers.diff -Patch88: kde4-migrate.diff -Patch94: systemsettings-root-kcm.diff -Patch98: kdm-dont-grab-mouse.diff -#Subject: Increase the time KDM waits for X to start up -#From: Lubos Lunak -#Patch-upstream: no -#Bug: bnc#462478 -Patch99: kdm-long-xserver-timeout.diff -Patch104: plasma-branding-defaults-applets.diff -Patch106: plasma-dashboard-leave.diff -Patch107: plasma-kickoff-newly-collapsing.diff -Patch108: plasma-panel-resize-hint.diff -Patch123: kdm-fix-generic-greeter.diff -Patch124: kdm-fix-labelcolors.diff -Patch125: pam-translate.diff -Patch126: dont-install-solid-netbackends.diff -Patch127: krunner-no-italics.diff -Patch201: plasma-notifications-kill-timer.diff -Patch202: plasma-disable-networkmanager.diff +## KDM patches +# PATCH-FIX-OPENSUSE kdm-cope-with-new-grub.diff -- Don't look for grub-set-default, we won't need it (bnc#771545) +Patch1: kdm-cope-with-new-grub.diff +# PATCH-FIX-OPENSUSE In O:F since r24 +Patch2: kdm-relaxed-auth.diff +Patch3: kdm-make_it_cool.diff +# PATCH-FIX-OPENSUSE kdm-sysconfig-values.diff -- Adds syconfig support to KDM +Patch4: kdm-sysconfig-values.diff +# PATCH-FIX-OPENSUSE kdm-wordbreak.diff -- Wraps the username if it's too long +Patch5: kdm-wordbreak.diff +# PATCH-FIX-OPENSUSE kdm-remove-duplicated-sessions.diff -- Removes duplicate sessions from KDM session list +Patch6: kdm-remove-duplicated-sessions.diff +# PATCH-FIX-OPENSUSE kdm-all-users-nopass.diff -- Allows the setting which enables users to login without password +Patch7: kdm-all-users-nopass.diff +# PATCH-FIX-OPENSUSE kdm-kdmconf.diff -- Cleans up the old kdmrc file +Patch8: kdm-kdmconf.diff +# PATCH-FIX-OPENSUSE kdm-dont-grab-mouse.diff -- Revert changes in KDM that made it also grab the mouse, which +# prevents xvkbd from working on tablet PCs (bnc#445726) +Patch9: kdm-dont-grab-mouse.diff +# PATCH-FIX-OPENSUSE kdm-long-xserver-timeout.diff -- Increases the time KDM waits for X to start up (bnc#462478) +Patch10: kdm-long-xserver-timeout.diff +# PATCH-FIX-OPENSUSE These three patches are workarounds for fingerprint support (bnc#533189) +Patch11: kdm-fix-generic-greeter.diff +Patch12: kdm-fix-labelcolors.diff +Patch13: same-pam-generic-classic.diff # PATCH-FIX-OPENSUSE kdm_systemd_shutdown.patch Avoid the situation where systemd would kill KDM # which prevents reboot/shutdown (Fedora Patch) -Patch213: kdm_systemd_shutdown.patch +Patch14: kdm_systemd_shutdown.patch +# Patch from Fedora to enable plymouth support in KDM. +# Patch is based on the changes within GDM to detect running plymouth +# and issue a quit to the plymouth daemon +Patch15: kdm_plymouth.patch +## Workspace patches +# PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to users $KDEHOME, and adds %datadir/kde4/env +# to list of read enviroments +Patch16: startkde.diff +# PATCH-FIX-OPENSUSE kde4-migrate.diff -- Migrates config from .kde to .kde4 +Patch17: kde4-migrate.diff +# PATCH-FIX-OPENSUSE systemsettings-desktop.diff -- Changes name of System Settings to Configure Desktop +Patch18: systemsettings-desktop.diff +# PATCH-FIX-OPENSUSE rotate-wacom-pointers.diff -- Adds support to krandrtray that rotates wacom pointers when the display is rotated +Patch19: rotate-wacom-pointers.diff +# PATCH-FIX-OPENSUSE plasma-branding-defaults-applets.diff -- Brands kickoff, so it uses branded start-here icon, and adds +# several applications to SystemApplications category +Patch20: plasma-branding-defaults-applets.diff +# PATCH-FIX-OPENSUSE plasma-dashboard-leave.diff -- Makes possible to leave dashboard view with just left-click +Patch21: plasma-dashboard-leave.diff +# PATCH-FIX-OPENSUSE plasma-kickoff-newly-collapsing.diff -- Adds several features to kickoff, e.g. recently installed category, +# and reduced menu length +Patch22: plasma-kickoff-newly-collapsing.diff +# PATCH-FIX-OPENSUSE plasma-panel-resize-hint.diff -- Displays pixel size when resizing panel +Patch23: plasma-panel-resize-hint.diff +# PATCH-FIX-OPENSUSE dont-install-solid-netbackends.diff -- Excludes redundant Network Management backends from building +Patch24: dont-install-solid-netbackends.diff +# PATCH-FIX-OPENSUSE krunner-no-italics.diff -- Change italic krunner result subtext to be smaller instead of italic (kde#307344) +Patch25: krunner-no-italics.diff +# PATCH-FIX-OPENSUSE plasma-disable-networkmanager.diff -- Makes it possible to disable it on KDE start depending on sysconfig +Patch26: plasma-disable-networkmanager.diff %if %{with_systemd} # PATCH-FIX-UPSTREAM systemd-session-management-support-in-the-workspace.patch # This patch rewrites the reboot/shutdown code within workspace so that it works with systemd. -Patch214: systemd-session-management-support-in-the-workspace.patch +Patch27: systemd-session-management-support-in-the-workspace.patch %endif -# Patch from Fedora to enable plymouth support in KDM. -# Patch is based on the changes within GDM to detect running plymouth -# and issue a quit to the plymouth daemon -Patch400: kdm_plymouth.patch -# PATCH-FIX-OPENSUSE opensuse-homepage.diff -Patch401: opensuse-homepage.diff +# PATCH-FIX-OPENSUSE opensuse-homepage.diff -- Makes kickoff use openSUSE homepage as default +Patch28: opensuse-homepage.diff # PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) -Patch402: opensuse-kinfocenter.diff +Patch29: opensuse-kinfocenter.diff # PATCH-FIX-OPENSUSE storage.diff (created by Alin M. Elena to add unique names for partitions in kinfocenter) -Patch403: storage.diff -# PATCH-FIX-OPENSUSE pager.diff Use plasma theme color for pager text -Patch404: pager.diff +Patch30: storage.diff +# PATCH-FIX-OPENSUSE pager.diff -- Use plasma theme color for pager text +Patch31: pager.diff # PATCH-FIX-UPSTREAM fix-plasma-theme-workaround-tabbox.patch -- Fix tabbox drawing (exposed in default openSUSE 12.3 plasma theme) -Patch405: fix-plasma-theme-workaround-tabbox.patch +Patch32: fix-plasma-theme-workaround-tabbox.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1200 Requires: %{name}-branding = %{version} -%else -Requires: %{name}-branding -%endif Requires: %{name}-ksysguardd = %{version} Requires: %{name}-liboxygenstyle = %{version} # Requires /etc/xdg/menus/applications.menu (bnc#754104) Requires: desktop-data-openSUSE Requires: kactivities4 >= %{version} Requires: kde4-kgreeter-plugins = %{version} -%if %suse_version > 1110 Requires: polkit-kde-agent-1 Requires: polkit-kde-kcmmodules-1 -%endif Requires: windowmanager -%if %suse_version > 1210 # patch kdm-sysconfig-values.diff requires /var/lib/xdm/authdir/authfiles (bnc#784212) Requires: xdm -%endif %if %suse_version > 1220 Requires: xmessage Requires: xprop @@ -173,24 +174,6 @@ Requires(pre): permissions %define debug_package_requires %{name} = %{version}-%{release} kdelibs4-debuginfo Provides: kdebase3:/opt/kde3/bin/kicker -Provides: powerdevil = 1.4.1 -Obsoletes: powerdevil < 1.4.1 -Provides: powerdevil-lang = 1.4.1 -Obsoletes: powerdevil-lang < 1.4.1 -Provides: kpowersave = 0.7.3_svn3167 -Obsoletes: kpowersave < 0.7.3_svn3167 -Provides: kpowersave-lang = 0.7.3_svn3167 -Obsoletes: kpowersave-lang < 0.7.3_svn3167 -Provides: kde4-plasmoid-quicklauncher = 0.4 -Obsoletes: kde4-plasmoid-quicklauncher < 0.4 -Provides: PolicyKit-kde = 0.2.0 -Obsoletes: PolicyKit-kde < 0.2.0 -Provides: PolicyKit-kde-lang = 11.2 -Obsoletes: PolicyKit-kde-lang < 11.2 -# kdeaccessibility package used to contain Zion -# color scheme which is now in -workspace -Provides: kdeaccessibility = %{version} -Obsoletes: kdeaccessibility < %{version} #Ktouchpadenabler is now part of workspace Provides: ktouchpadenabler = %{version} Obsoletes: ktouchpadenabler < %{version} @@ -227,8 +210,6 @@ Provides: kdm-branding = %{version} Requires(pre): %fillup_prereq Supplements: packageand(kdm:branding-upstream) -Provides: kde4-kdm-branding-upstream = 4.3.0 -Obsoletes: kde4-kdm-branding-upstream < 4.3.0 Conflicts: otherproviders(kdm-branding) %description -n kdm-branding-upstream @@ -239,6 +220,7 @@ Summary: KDE base package: ksysguard daemon Group: System/GUI/KDE Requires(pre): %insserv_prereq +%kde4_runtime_requires %description ksysguardd This package contains the ksysguard daemon and application. @@ -251,14 +233,8 @@ Group: System/GUI/KDE Provides: windowmanager %kde4_runtime_requires -%if %suse_version > 1200 Requires: %{name}-branding = %{version} -%else -Requires: %{name}-branding -%endif -Provides: kde4-kwin = 4.3.0 Provides: kdebase3:/opt/kde3/bin/kwin -Obsoletes: kde4-kwin < 4.3.0 %description -n kwin KWin is the window manager of the K desktop environment. @@ -290,21 +266,16 @@ %package -n kdm Summary: KDE login and display manager Group: System/GUI/KDE -%if %suse_version > 1200 Requires: kdm-branding = %{version} -%else -Requires: kdm-branding -%endif %if !%{with_systemd} Requires: ConsoleKit-x11 %endif Requires: kde4-kgreeter-plugins = %{version} +Requires: logrotate Requires: pam-config Requires: xorg-x11-server Provides: kdebase3-kdm = 3.5.1 Obsoletes: kdebase3-kdm < 3.5.1 -Provides: kde4-kdm = 4.3.0 -Obsoletes: kde4-kdm < 4.3.0 %kde4_runtime_requires %description -n kdm @@ -326,6 +297,7 @@ Supplements: packageand(akonadi-runtime:kdebase4-workspace) Requires: %{name} = %{version} Recommends: akonadi-runtime +%kde4_runtime_requires %description plasma-calendar This packages contains the calendar Plasma engine and applet, which are based on Akonadi. @@ -341,56 +313,45 @@ %prep %setup -q -n kde-workspace-%{version} -###KDE47: rewrite! -#%%patch8 +## KDM patches +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +%patch8 +%patch9 -p0 +%patch10 +%patch11 +%patch12 -p1 +%patch13 +%patch14 -p1 +%patch15 +## Workspace patches +%patch16 +%patch17 %patch18 -#%%patch60 -%patch62 -%patch63 -%patch64 -%if %suse_version > 1210 -%patch65 -%endif -%patch66 -%patch67 -%patch68 -%patch69 -%patch70 -p0 -%patch71 -%patch77 -%patch82 -%patch88 -### Remove when KDM KCM configuration bugs are fixed -###KDE47: rediff! -#%%patch94 -%patch98 -%patch99 -%patch104 -%patch106 -%patch107 -%patch108 -%patch123 -%patch124 -p1 -###KDE47: rediff -#%%patch125 -%patch126 -p1 -%patch127 -p1 -%patch201 -p1 -%patch202 -p1 -%patch213 -p1 +%patch19 +%patch20 +%patch21 +%patch22 +%patch23 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 %if %{with_systemd} -%patch214 -p1 +%patch27 -p1 %endif -%patch400 -p0 -%patch401 -p1 -%patch402 -p1 -%patch403 -p1 -%patch404 -p1 -%patch405 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build -### TODO: -DKDE4_ENABLE_FINAL=1 EXTRA_FLAGS="-DKDE4_COMMON_PAM_SERVICE=xdm \ -DSYSCONF_INSTALL_DIR=/etc \ -DKDE4_ENABLE_FPIE=1" @@ -457,18 +418,12 @@ rm -rf %{buildroot} rm -rf filelists -%if 0%{?suse_version} >= 1140 %verifyscript %verify_permissions -e %{_kde4_libexecdir}/kcheckpass -%verify_permissions -e %{_kde4_libexecdir}/kdesud -%endif %post /sbin/ldconfig -%if 0%{?suse_version} >= 1140 %set_permissions %{_kde4_libexecdir}/kcheckpass -%set_permissions %{_kde4_libexecdir}/kdesud -%endif %postun -p /sbin/ldconfig @@ -539,11 +494,9 @@ %doc COPYING %{_kde4_appsdir}/kwin/cubecap.png %{_kde4_appsdir}/kwin/titlebar_decor.png -%if 0%{?suse_version} > 1140 %{_kde4_appsdir}/plasma-desktop/init %{_kde4_appsdir}/plasma-netbook/init %{_kde4_appsdir}/plasma/layout-templates -%endif %files -n kde4-kgreeter-plugins %defattr(-,root,root) @@ -598,7 +551,7 @@ %files liboxygenstyle %defattr(-,root,root) %doc COPYING COPYING.DOC README -%{_kde4_libdir}/liboxygenstyle.* +%{_kde4_libdir}/liboxygenstyle.so.* %dir %{_kde4_modulesdir}/plugins/styles %{_kde4_modulesdir}/plugins/styles/oxygen.so @@ -620,6 +573,11 @@ %{_kde4_libdir}/libkscreensaver.so %{_kde4_libdir}/libprocesscore.so %{_kde4_libdir}/libprocessui.so +%{_kde4_libdir}/libpowerdevilconfigcommonprivate.so +%{_kde4_libdir}/libpowerdevilcore.so +%{_kde4_libdir}/libpowerdevilui.so +%{_kde4_libdir}/liboxygenstyle.so +%{_kde4_libdir}/liboxygenstyleconfig.so %{_kde4_libdir}/libksgrd.so %{_kde4_libdir}/libtaskmanager.so %{_kde4_libdir}/libksignalplotter.so @@ -656,9 +614,7 @@ %config %{_kde4_configkcfgdir}/ %{_kde4_datadir}/autostart/ %{_kde4_datadir}/dbus-1/ -%if %suse_version > 1110 %{_kde4_datadir}/polkit-1/ -%endif %{_kde4_iconsdir}/Oxygen* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/* @@ -709,7 +665,11 @@ %exclude %{_kde4_libdir}/libksgrd.so %exclude %{_kde4_libdir}/libkworkspace.so %exclude %{_kde4_libdir}/liblsofui.so +%exclude %{_kde4_libdir}/libpowerdevilconfigcommonprivate.so +%exclude %{_kde4_libdir}/libpowerdevilcore.so +%exclude %{_kde4_libdir}/libpowerdevilui.so %exclude %{_kde4_libdir}/liboxygenstyle.* +%exclude %{_kde4_libdir}/liboxygenstyleconfig.so %exclude %{_kde4_libdir}/libplasmaclock.so %exclude %{_kde4_libdir}/libplasmagenericshell.so %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so @@ -735,10 +695,8 @@ %exclude %{_kde4_servicesdir}/plasma-scriptengine-dataengine-python.desktop %exclude %{_kde4_servicesdir}/plasma-scriptengine-runner-python.desktop %exclude %{_kde4_servicesdir}/plasma-scriptengine-wallpaper-python.desktop -%if 0%{?suse_version} > 1140 %exclude %{_kde4_appsdir}/plasma-desktop/init %exclude %{_kde4_appsdir}/plasma-netbook/init %exclude %{_kde4_appsdir}/plasma/layout-templates -%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2013-04-29 13:57:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2013-04-08 14:37:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2013-04-29 13:57:48.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 07:22:29 UTC 2013 - pgajdos(a)suse.com + +- require cvsps2 instead of cvsps [bnc#809800] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.QaC4bQ/_old 2013-04-29 13:57:50.000000000 +0200 +++ /var/tmp/diff_new_pack.QaC4bQ/_new 2013-04-29 13:57:50.000000000 +0200 @@ -98,7 +98,7 @@ Summary: Git tools for importing CVS repositories Group: Development/Tools/Version Control Requires: cvs -Requires: cvsps +Requires: cvsps2 Requires: git-core = %{version} Requires: perl-DBD-SQLite -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit galculator for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package galculator for openSUSE:Factory checked in at 2013-04-29 13:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/galculator (Old) and /work/SRC/openSUSE:Factory/.galculator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "galculator", Maintainer is "BWalle(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/galculator/galculator.changes 2013-03-14 15:36:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.galculator.new/galculator.changes 2013-04-29 13:57:40.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 29 09:19:33 UTC 2013 - andrea(a)opensuse.org + +- new upstream version 2.1.2 + * This release fixes a handful of bugs: + a minor flaw in the build process and + migrates some deprecated GUI elements to recent GTK3 + * Added Lithuanian Translation. + +------------------------------------------------------------------- Old: ---- galculator-2.1.tar.bz2 New: ---- galculator-2.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ galculator.spec ++++++ --- /var/tmp/diff_new_pack.dBAKx0/_old 2013-04-29 13:57:41.000000000 +0200 +++ /var/tmp/diff_new_pack.dBAKx0/_new 2013-04-29 13:57:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: galculator -Version: 2.1 +Version: 2.1.2 Release: 0 Summary: A GTK 2/3 based calculator License: GPL-2.0+ ++++++ galculator-2.1.tar.bz2 -> galculator-2.1.2.tar.bz2 ++++++ ++++ 47709 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit amanda for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at 2013-04-29 13:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amanda (Old) and /work/SRC/openSUSE:Factory/.amanda.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amanda", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/amanda/amanda.changes 2013-01-19 16:35:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amanda.new/amanda.changes 2013-04-29 13:53:00.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 08:36:36 UTC 2013 - mmeister(a)suse.com + +- Added automake --add-missing option to fix build with new automake + +------------------------------------------------------------------- New: ---- amanda-automake_add_missing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.m5UE2j/_old 2013-04-29 13:53:04.000000000 +0200 +++ /var/tmp/diff_new_pack.m5UE2j/_new 2013-04-29 13:53:04.000000000 +0200 @@ -67,6 +67,7 @@ Patch6: amanda-2.6.1p1-avoid-perl-provides.patch Patch8: amanda-gets.patch Patch9: amanda-3.3.2-returnvalues.patch +Patch10: amanda-automake_add_missing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -82,6 +83,7 @@ %patch6 -p1 %patch8 -p1 %patch9 -p1 +%patch10 %build ./autogen ++++++ amanda-automake_add_missing.patch ++++++ --- autogen.orig 2013-04-26 10:27:38.591941991 +0200 +++ autogen 2013-04-26 10:28:28.255657782 +0200 @@ -57,4 +57,4 @@ touch config/config.h.in echo "..automake" -automake --force --copy --warnings=none || die "automake failed" +automake --force --copy --warnings=none --add-missing || die "automake failed" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0