openSUSE Commits April 2006

commit@lists.opensuse.org

1 participants
1177 discussions

by root＠suse.de

Hello community, here is the log from the commit of package pcsc-etoken checked in at Sun Apr 2 12:43:25 CEST 2006. -------- --- pcsc-etoken/pcsc-etoken.changes 2006-01-25 21:39:20.000000000 +0100 +++ pcsc-etoken/pcsc-etoken.changes 2006-04-02 00:00:24.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 2 00:12:14 CEST 2006 - sndirsch(a)suse.de + +- added missing locale provides (Bug #161867) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-etoken.spec ++++++ --- /var/tmp/diff_new_pack.GSZgoU/_old 2006-04-02 12:43:19.000000000 +0200 +++ /var/tmp/diff_new_pack.GSZgoU/_new 2006-04-02 12:43:19.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,8 @@ Name: pcsc-etoken BuildRequires: pcsc-lite-devel pkgconfig Version: 0.3.2 -Release: 1 +Release: 8 +Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries License: BSD URL: http://www.linuxnet.com/ @@ -57,6 +58,8 @@ %{ifddir}/ %changelog -n pcsc-etoken +* Sun Apr 02 2006 - sndirsch(a)suse.de +- added missing locale provides (Bug #161867) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 03 2006 - mjancar(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit pcsc-cyberjack

by root＠suse.de

Hello community, here is the log from the commit of package pcsc-cyberjack checked in at Sun Apr 2 12:43:21 CEST 2006. -------- --- pcsc-cyberjack/pcsc-cyberjack.changes 2006-03-27 13:26:48.000000000 +0200 +++ pcsc-cyberjack/pcsc-cyberjack.changes 2006-04-02 00:00:14.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 2 00:12:04 CEST 2006 - sndirsch(a)suse.de + +- added missing locale provides (Bug #161867) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.9jDSRO/_old 2006-04-02 12:43:13.000000000 +0200 +++ /var/tmp/diff_new_pack.9jDSRO/_new 2006-04-02 12:43:13.000000000 +0200 @@ -13,7 +13,8 @@ Name: pcsc-cyberjack BuildRequires: pcsc-lite-devel pkgconfig readline-devel Version: 2.0.10 -Release: 6 +Release: 7 +Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries License: LGPL URL: http://www.reiner-sct.de/support/treiber_cyberjack.php @@ -115,6 +116,8 @@ %{_bindir}/* %changelog -n pcsc-cyberjack +* Sun Apr 02 2006 - sndirsch(a)suse.de +- added missing locale provides (Bug #161867) * Mon Mar 27 2006 - schwab(a)suse.de - Fix building of shared libs. * Wed Mar 08 2006 - agruen(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit pcsc-ccid

by root＠suse.de

Hello community, here is the log from the commit of package pcsc-ccid checked in at Sun Apr 2 12:43:15 CEST 2006. -------- --- pcsc-ccid/pcsc-ccid.changes 2006-01-25 21:39:20.000000000 +0100 +++ pcsc-ccid/pcsc-ccid.changes 2006-04-02 00:00:04.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 2 00:11:54 CEST 2006 - sndirsch(a)suse.de + +- added missing locale provides (Bug #161867) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-ccid.spec ++++++ --- /var/tmp/diff_new_pack.wfSGbh/_old 2006-04-02 12:43:06.000000000 +0200 +++ /var/tmp/diff_new_pack.wfSGbh/_new 2006-04-02 12:43:06.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,8 @@ Name: pcsc-ccid BuildRequires: pcsc-lite-devel pkgconfig Version: 0.9.4 -Release: 1 +Release: 8 +Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries License: LGPL URL: http://www.geocities.com/cprados @@ -69,6 +70,8 @@ %{ifddir} %changelog -n pcsc-ccid +* Sun Apr 02 2006 - sndirsch(a)suse.de +- added missing locale provides (Bug #161867) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 03 2006 - mjancar(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit pcsc-acr38

by root＠suse.de

Hello community, here is the log from the commit of package pcsc-acr38 checked in at Sun Apr 2 12:43:09 CEST 2006. -------- --- pcsc-acr38/pcsc-acr38.changes 2006-01-25 21:39:19.000000000 +0100 +++ pcsc-acr38/pcsc-acr38.changes 2006-04-01 23:59:52.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 2 00:11:42 CEST 2006 - sndirsch(a)suse.de + +- added missing locale provides (Bug #161867) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-acr38.spec ++++++ --- /var/tmp/diff_new_pack.0nLVhT/_old 2006-04-02 12:42:50.000000000 +0200 +++ /var/tmp/diff_new_pack.0nLVhT/_new 2006-04-02 12:42:50.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,8 @@ Name: pcsc-acr38 BuildRequires: pcsc-lite-devel pkgconfig Version: 100705_P -Release: 1 +Release: 8 +Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries License: GPL, Other License(s), see package URL: http://www.linuxnet.com/ @@ -65,6 +66,8 @@ %{ifddir} %changelog -n pcsc-acr38 +* Sun Apr 02 2006 - sndirsch(a)suse.de +- added missing locale provides (Bug #161867) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 03 2006 - mjancar(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit openmotif

by root＠suse.de

Hello community, here is the log from the commit of package openmotif checked in at Sun Apr 2 12:42:46 CEST 2006. -------- --- openmotif/openmotif.changes 2006-01-25 21:39:04.000000000 +0100 +++ openmotif/openmotif.changes 2006-03-31 18:03:05.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 31 18:02:52 CEST 2006 - schwab(a)suse.de + +- Fix fencepost error. + +------------------------------------------------------------------- New: ---- PrintableString.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmotif.spec ++++++ --- /var/tmp/diff_new_pack.G0u5E4/_old 2006-04-02 12:42:18.000000000 +0200 +++ /var/tmp/diff_new_pack.G0u5E4/_new 2006-04-02 12:42:18.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package openmotif (Version 2.2.4) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,7 @@ Name: openmotif BuildRequires: update-desktop-files xorg-x11 xorg-x11-devel Version: 2.2.4 -Release: 6 +Release: 13 License: Other License(s), see package Group: System/Libraries AutoReqProv: on @@ -30,6 +30,7 @@ Patch4: openmotif-xpm.diff Patch5: sentinel.diff Patch6: openmotif-uil.diff +Patch7: PrintableString.diff %description This is the Open Motif runtime environment. It includes the Motif @@ -89,6 +90,7 @@ %patch4 %patch5 %patch6 +%patch7 %build rm -f depcomp @@ -101,6 +103,7 @@ ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --libdir=/usr/X11R6/%{_lib} \ --datadir=/usr/X11R6/lib +# Not parallel safe make %install @@ -132,11 +135,9 @@ chmod a+r $SITEDEF fi -%post libs -%run_ldconfig +%post libs -p /sbin/ldconfig -%postun libs -%run_ldconfig +%postun libs -p /sbin/ldconfig %postun devel if [ "$1" = 0 ]; then @@ -225,6 +226,8 @@ %doc /usr/X11R6/man/manm %changelog -n openmotif +* Fri Mar 31 2006 - schwab(a)suse.de +- Fix fencepost error. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Dec 05 2005 - schwab(a)suse.de ++++++ PrintableString.diff ++++++ --- lib/Xm/TextF.c +++ lib/Xm/TextF.c @@ -3723,15 +3723,15 @@ cache_ptr = tmp = XmStackAlloc(buf_size, cache); tmp_str = (wchar_t *)str; - ret_val = wctomb(tmp, *tmp_str); + ret_val = 0; count = 0; - while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) + while (count < n && buf_size >= MB_CUR_MAX && + (ret_val = wctomb(tmp, *tmp_str)) > 0) { count += 1; tmp += ret_val; buf_size -= ret_val; tmp_str++; - ret_val = wctomb(tmp, *tmp_str); } if (ret_val == -1) /* bad character */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit libzypp

by root＠suse.de

Hello community, here is the log from the commit of package libzypp checked in at Sun Apr 2 12:42:16 CEST 2006. -------- --- libzypp/libzypp.changes 2006-03-31 18:59:31.000000000 +0200 +++ libzypp/libzypp.changes 2006-04-02 12:02:09.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 2 11:17:56 CEST 2006 - kkaempf(a)suse.de + +- allow setting of source when parsing local .rpm (#147765) +- rev 2880 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.PeGsQL/_old 2006-04-02 12:42:03.000000000 +0200 +++ /var/tmp/diff_new_pack.PeGsQL/_new 2006-04-02 12:42:03.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 67 +Release: 68 Source: zypp-0.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -104,6 +104,9 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Sun Apr 02 2006 - kkaempf(a)suse.de +- allow setting of source when parsing local .rpm (#147765) +- rev 2880 * Fri Mar 31 2006 - schubi(a)suse.de - Do not update packages over other architectures * Fri Mar 31 2006 - sh(a)suse.de ++++++ zypp-0.0.0.tar.bz2 ++++++ libzypp/zypp-0.0.0.tar.bz2 libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit libzypp-zmd-backend

by root＠suse.de

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Sun Apr 2 12:42:11 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-30 22:06:44.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-02 12:00:49.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 2 11:23:17 CEST 2006 - kkaempf(a)suse.de + +- create dummy source for local packages (#147765) +- rev 2881 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.gsiIMZ/_old 2006-04-02 12:42:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gsiIMZ/_new 2006-04-02 12:42:02.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 26 +Release: 27 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Sun Apr 02 2006 - kkaempf(a)suse.de +- create dummy source for local packages (#147765) +- rev 2881 * Thu Mar 30 2006 - kkaempf(a)suse.de - fix 'update-status', the 'status' attribute was moved to the resolvables table ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc --- old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-03-29 18:28:35.000000000 +0200 +++ new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-04-02 11:49:08.000000000 +0200 @@ -564,27 +564,20 @@ sqlite3_bind_text( handle, 2, pkg->group().c_str(), -1, SQLITE_STATIC ); sqlite3_bind_text( handle, 3, pkg->summary().c_str(), -1, SQLITE_STATIC ); sqlite3_bind_text( handle, 4, desc2str(pkg->description()).c_str(), -1, SQLITE_STATIC ); - const char *plainrpm = pkg->plainRpm().asString().c_str(); - if (plainrpm[0] == '.' && plainrpm[1] == '/') plainrpm += 2; // strip leading "./" - sqlite3_bind_text( handle, 5, plainrpm, -1, SQLITE_STATIC ); // package_url - Source_Ref src( pkg->source() ); -#if 1 // set to 0 once Source::remote() is fixed (#157469) - if (source_is_local( src )) - { - sqlite3_bind_text( handle, 6, plainrpm, -1, SQLITE_STATIC ); // so zypp knows how to get the package - } - else { - sqlite3_bind_text( handle, 6, NULL, -1, SQLITE_STATIC ); // else zmd knows how to get the package - } -#else + + sqlite3_bind_text( handle, 5, src.url().asString().c_str(), -1, SQLITE_STATIC ); // package_url + if (src.remote()) { - sqlite3_bind_text( handle, 6, NULL, -1, SQLITE_STATIC ); // zmd knows how to get the package + DBG << "Source " << src << " is remote"; + sqlite3_bind_text( handle, 6, NULL, -1, SQLITE_STATIC ); // zmd knows how to get the package } else { - sqlite3_bind_text( handle, 6, pkg->plainRpm().asString().c_str(), -1, SQLITE_STATIC ); // zypp knows how to get the package + const char *plainrpm = pkg->plainRpm().asString().c_str(); + if (plainrpm[0] == '.' && plainrpm[1] == '/') plainrpm += 2; // strip leading "./" + DBG << "Source " << src << " is local, plainrpm " << plainrpm << endl; + sqlite3_bind_text( handle, 6, plainrpm, -1, SQLITE_STATIC ); // zypp knows how to get the package } -#endif sqlite3_bind_text( handle, 7, NULL, -1, SQLITE_STATIC ); // signature_filename sqlite3_bind_int( handle, 8, pkg->size() ); sqlite3_bind_int( handle, 9, pkg->installOnly() ? 1 : 0 ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbSources.cc new/zmd-backend-7.1.1/src/dbsource/DbSources.cc --- old/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-03-30 09:52:59.000000000 +0200 +++ new/zmd-backend-7.1.1/src/dbsource/DbSources.cc 2006-04-02 11:22:54.000000000 +0200 @@ -61,6 +61,34 @@ } +Source_Ref +DbSources::createDummy( const Url & url, const string & catalog ) +{ + media::MediaManager mmgr; + media::MediaId mediaid = mmgr.open( url ); + SourceFactory factory; + + try { + + DbSourceImpl *impl = new DbSourceImpl (); + impl->factoryCtor( mediaid, Pathname(), catalog ); + impl->setId( catalog ); + impl->setZmdName( catalog ); + impl->setZmdDescription ( catalog ); + impl->setPriority( 0 ); + impl->setSubscribed( true ); + + Source_Ref src( factory.createFrom( impl ) ); + return src; + } + catch (Exception & excpt_r) { + ZYPP_CAUGHT(excpt_r); + } + + return Source_Ref(); +} + + const SourcesList & DbSources::sources (bool refresh) { @@ -122,13 +150,6 @@ << ", subs " << subscribed << endl; - if (id != "@system" - && subscribed == 0) - { - MIL << "Not subscribed, skipping" << endl; - continue; - } - if (alias.empty()) alias = name; if (desc.empty()) desc = alias; @@ -140,6 +161,7 @@ impl->setZmdName( name ); impl->setZmdDescription ( desc ); impl->setPriority( priority ); + impl->setSubscribed( subscribed != 0 ); impl->attachDatabase( _db ); impl->attachIdMap( &_idmap ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbSources.h new/zmd-backend-7.1.1/src/dbsource/DbSources.h --- old/zmd-backend-7.1.1/src/dbsource/DbSources.h 2006-03-19 00:25:11.000000000 +0100 +++ new/zmd-backend-7.1.1/src/dbsource/DbSources.h 2006-04-02 11:22:43.000000000 +0200 @@ -29,6 +29,7 @@ #include <sqlite3.h> #include <zypp/Source.h> +#include <zypp/Url.h> #include <zypp/PoolItem.h> #include "DbAccess.h" @@ -53,6 +54,8 @@ const SourcesList & sources (bool refresh = false); zypp::ResObject::constPtr getById (sqlite_int64 id) const; + + static zypp::Source_Ref createDummy( const zypp::Url & url, const std::string & catalog ); }; #endif // ZMD_BACKEND_DBSOURCES_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/find-file.cc new/zmd-backend-7.1.1/src/find-file.cc --- old/zmd-backend-7.1.1/src/find-file.cc 2006-03-28 22:25:06.000000000 +0200 +++ new/zmd-backend-7.1.1/src/find-file.cc 2006-03-31 16:23:17.000000000 +0200 @@ -39,7 +39,7 @@ MIL << "-------------------------------------" << endl; MIL << "START find-file " << argv[1] << " " << argv[2] << endl; - ZYpp::Ptr God = backend::getZYpp(); + ZYpp::Ptr God = backend::getZYpp( true ); Target_Ptr target = backend::initTarget( God ); string name = target->rpmDb().whoOwnsFile( argv[2] ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/package-files.cc new/zmd-backend-7.1.1/src/package-files.cc --- old/zmd-backend-7.1.1/src/package-files.cc 2006-03-28 22:25:11.000000000 +0200 +++ new/zmd-backend-7.1.1/src/package-files.cc 2006-03-31 16:23:22.000000000 +0200 @@ -233,7 +233,7 @@ if (!db.openDb( true )) // open for writing return 1; - ZYpp::Ptr God = backend::getZYpp(); + ZYpp::Ptr God = backend::getZYpp( true ); Target_Ptr target = backend::initTarget( God ); int result = package_files( db.db(), str::strtonum<long long>( argv[2] ), target ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/parse-metadata.cc new/zmd-backend-7.1.1/src/parse-metadata.cc --- old/zmd-backend-7.1.1/src/parse-metadata.cc 2006-03-28 22:25:14.000000000 +0200 +++ new/zmd-backend-7.1.1/src/parse-metadata.cc 2006-03-31 16:24:41.000000000 +0200 @@ -222,7 +222,7 @@ // database type path/uri catalog/alias MIL << "START parse-metadata " << argv[1] << " " << argv[2] << " " << argv[3] << " " << argv[4] << endl; - ZYpp::Ptr God = backend::getZYpp(); + ZYpp::Ptr God = backend::getZYpp( ); manager = SourceManager::sourceManager(); if (! restore_sources ()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-files.cc new/zmd-backend-7.1.1/src/query-files.cc --- old/zmd-backend-7.1.1/src/query-files.cc 2006-03-28 22:28:46.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-files.cc 2006-04-02 11:53:16.000000000 +0200 @@ -10,6 +10,7 @@ #include <zypp/ZYpp.h> #include <zypp/ZYppFactory.h> + #include <zypp/SourceManager.h> #include <zypp/Source.h> #include <zypp/base/Logger.h> @@ -28,6 +29,7 @@ #include <sys/stat.h> #include "dbsource/DbAccess.h" +#include "dbsource/DbSources.h" #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "query-files" @@ -35,17 +37,18 @@ //----------------------------------------------------------------------------- static ResStore -query_file (const Pathname & path) +query_file (const Pathname & path, Source_Ref source) { ResStore store; - MIL << "query_file(" << path << ")" << endl; + MIL << "query_file(" << path << "), source " << source << endl; target::rpm::RpmHeader::constPtr header = target::rpm::RpmHeader::readPackage( path ); - Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, path ); + Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, path, source ); if (package != NULL) { + DBG << "package source " << package->source() << endl; store.insert( package ); } @@ -101,14 +104,14 @@ int extract_packages_from_directory (ResStore & store, const Pathname & path, - const string & alias, + Source_Ref source, bool recursive) { Pathname filename; PathInfo magic; bool distro_magic, pkginfo_magic; -DBG << "extract_packages_from_directory(.., " << path << ", " << alias << ", " << recursive << ")" << endl; +DBG << "extract_packages_from_directory(.., " << path << ", " << source.alias() << ", " << recursive << ")" << endl; /* Check for magic files that indicate how to treat the @@ -222,7 +225,7 @@ PathInfo file_info( file_path ); if (recursive && file_info.isDir()) { - extract_packages_from_directory( store, file_path, alias, recursive ); + extract_packages_from_directory( store, file_path, source, recursive ); } else if (file_info.isFile()) { @@ -232,7 +235,7 @@ if (string(*it, ++dotpos) != "rpm") continue; target::rpm::RpmHeader::constPtr header = target::rpm::RpmHeader::readPackage( file_path ); - Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, file_path ); + Package::Ptr package = target::rpm::RpmDb::makePackageFromHeader( header, NULL, file_path, source ); if (package != NULL) { DBG << "Adding package " << *package << endl; @@ -245,11 +248,11 @@ static ResStore -query_directory (const Pathname & path, bool recursive) +query_directory (const Pathname & path, bool recursive, Source_Ref source) { ResStore store; MIL << "query_directory( " << path << (recursive?", recursive":"") << ")" << endl; - extract_packages_from_directory( store, path, "@local", recursive ); + extract_packages_from_directory( store, path, source, recursive ); return store; } @@ -257,10 +260,12 @@ //---------------------------------------------------------------------------- static ResStore -query (const string & uri, const string & channel_id) +query (const string & uri, Source_Ref source) { ResStore store; + MIL << "query(" << uri << ", " << source << ")" << endl; + /* The magic 7 is strlen ("file://") */ if (uri.size() < 7 @@ -284,12 +289,7 @@ path = p; } - MIL << "query(" << uri << ") path '" << path << "'" << endl; - -#if 0 - channel = rc_channel_new (channel_id != NULL ? channel_id : "@local", - "foo", "foo", "foo"); -#endif + MIL << "query path '" << path << "'" << endl; struct stat buf; @@ -300,7 +300,7 @@ } else if (S_ISREG( buf.st_mode )) { /* Single file */ - store = query_file( path ); + store = query_file( path, source ); } else if (S_ISDIR( buf.st_mode )) { /* Directory */ @@ -312,7 +312,7 @@ string p( uri, query_part + 1 ); parse_query( p, &recursive ); } - store = query_directory( path, recursive ); + store = query_directory( path, recursive, source ); } return store; @@ -402,7 +402,7 @@ MIL << "-------------------------------------" << endl; MIL << "START query-files " << argv[1] << " " << argv[2] << " " << ((argc>3)?argv[3]:"") << endl; - ZYpp::Ptr God = backend::getZYpp(); + ZYpp::Ptr God = backend::getZYpp( true ); DbAccess db(argv[1]); @@ -417,7 +417,10 @@ } else { MIL << "Doing a file/directory query" << endl; - ResStore store = query( argv[2], argc == 4 ? argv[3] : "@local" ); + + Source_Ref source = DbSources::createDummy( Url("file:///"), argc == 4 ? argv[3] : "@local" ); + + ResStore store = query( argv[2], source ); if (!store.empty()) { db.writeStore( store, ResStatus::uninstalled ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-pool.cc new/zmd-backend-7.1.1/src/query-pool.cc --- old/zmd-backend-7.1.1/src/query-pool.cc 2006-03-30 14:58:53.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-pool.cc 2006-03-31 16:22:01.000000000 +0200 @@ -143,7 +143,7 @@ MIL << "START query-pool " << filter << " " << catalog << endl; - ZYpp::Ptr Z = backend::getZYpp(); + ZYpp::Ptr Z = backend::getZYpp( true ); Target_Ptr target = backend::initTarget( Z, false ); query_pool( Z, filter, catalog ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/query-system.cc new/zmd-backend-7.1.1/src/query-system.cc --- old/zmd-backend-7.1.1/src/query-system.cc 2006-03-30 14:45:03.000000000 +0200 +++ new/zmd-backend-7.1.1/src/query-system.cc 2006-03-31 16:22:06.000000000 +0200 @@ -155,7 +155,7 @@ MIL << "-------------------------------------" << endl; MIL << "START query-system " << argv[1] << endl; - ZYpp::Ptr God = backend::getZYpp(); + ZYpp::Ptr God = backend::getZYpp( true ); Target_Ptr target = backend::initTarget( God, false ); DbAccess db( argv[1] ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/resolve-dependencies.cc new/zmd-backend-7.1.1/src/resolve-dependencies.cc --- old/zmd-backend-7.1.1/src/resolve-dependencies.cc 2006-03-29 13:06:29.000000000 +0200 +++ new/zmd-backend-7.1.1/src/resolve-dependencies.cc 2006-03-31 16:22:14.000000000 +0200 @@ -75,7 +75,7 @@ if (!db.openDb(false)) return 1; - ZYpp::Ptr God = backend::getZYpp(); + ZYpp::Ptr God = backend::getZYpp( true ); // load the catalogs and resolvables from sqlite db diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/transact.cc new/zmd-backend-7.1.1/src/transact.cc --- old/zmd-backend-7.1.1/src/transact.cc 2006-03-30 18:50:32.000000000 +0200 +++ new/zmd-backend-7.1.1/src/transact.cc 2006-03-31 12:45:21.000000000 +0200 @@ -134,9 +134,12 @@ PoolItemList x,y,z; ::setenv( "YAST_IS_RUNNING", "1", 1 ); - +#if 0 +#warning dry_run disabled + God->target()->commit( God->pool(), 0, x, y, z ); +#else God->target()->commit( God->pool(), 0, x, y, z, dry_run ); - +#endif ExternalProgram suseconfig( "/sbin/SuSEconfig", ExternalProgram::Discard_Stderr ); // should redirect stderr to logfile suseconfig.close(); // discard exit code } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/zmd-backend.cc new/zmd-backend-7.1.1/src/zmd-backend.cc --- old/zmd-backend-7.1.1/src/zmd-backend.cc 2006-03-30 14:44:22.000000000 +0200 +++ new/zmd-backend-7.1.1/src/zmd-backend.cc 2006-03-31 16:21:18.000000000 +0200 @@ -4,14 +4,19 @@ #include "zmd-backend.h" +#include <zypp/zypp_detail/ZYppReadOnlyHack.h> + using namespace zypp; using namespace std; namespace backend { ZYpp::Ptr -getZYpp() +getZYpp( bool readonly ) { + if (readonly) + zypp::zypp_readonly_hack::IWantIt(); + ZYpp::Ptr Z = NULL; try { Z = zypp::getZYpp(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/zmd-backend.h new/zmd-backend-7.1.1/src/zmd-backend.h --- old/zmd-backend-7.1.1/src/zmd-backend.h 2006-03-30 14:44:31.000000000 +0200 +++ new/zmd-backend-7.1.1/src/zmd-backend.h 2006-03-31 16:21:49.000000000 +0200 @@ -12,7 +12,7 @@ namespace backend { // get ZYpp pointer, exit(1) if locked -zypp::ZYpp::Ptr getZYpp(); +zypp::ZYpp::Ptr getZYpp( bool readonly = false ); // init Target (root="/", commit_only=true), exit(1) on error zypp::Target_Ptr initTarget( zypp::ZYpp::Ptr Z, bool commit_only = true ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit kdebase3

by root＠suse.de

Hello community, here is the log from the commit of package kdebase3 checked in at Sun Apr 2 12:41:58 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-03-28 17:46:51.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-03-31 17:30:41.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 31 17:24:26 CEST 2006 - stbinner(a)suse.de + +- update media_hal.diff to make it possible that applications like + k3b can stop automounting (#160654) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.hwSf1m/_old 2006-04-02 12:41:09.000000000 +0200 +++ /var/tmp/diff_new_pack.hwSf1m/_new 2006-04-02 12:41:09.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.1 -Release: 48 +Release: 49 %define kde_version 3.5.1 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -321,7 +321,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 61 +Release: 62 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1383,6 +1383,9 @@ %endif %changelog -n kdebase3 +* Fri Mar 31 2006 - stbinner(a)suse.de +- update media_hal.diff to make it possible that applications like + k3b can stop automounting (#160654) * Tue Mar 28 2006 - coolo(a)suse.de - update media_hal.diff to handle fstab entries more correctly * Thu Mar 23 2006 - stbinner(a)suse.de ++++++ media_hal.diff ++++++ --- /var/tmp/diff_new_pack.hwSf1m/_old 2006-04-02 12:41:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hwSf1m/_new 2006-04-02 12:41:12.000000000 +0200 @@ -1,7 +1,7 @@ Index: medianotifier/medianotifier.cpp =================================================================== ---- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ medianotifier/medianotifier.cpp (.../work/coolos_media) (Revision 523597) +--- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ medianotifier/medianotifier.cpp (.../work/coolos_media) (revision 525009) @@ -54,7 +54,10 @@ { kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " @@ -30,8 +30,8 @@ return false; Index: libmediacommon/medium.cpp =================================================================== ---- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ libmediacommon/medium.cpp (.../work/coolos_media) (Revision 523597) +--- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ libmediacommon/medium.cpp (.../work/coolos_media) (revision 525009) @@ -40,6 +40,8 @@ m_properties+= QString::null; /* ICON_NAME */ @@ -52,8 +52,8 @@ const Medium Medium::create(const QStringList &properties) Index: libmediacommon/medium.h =================================================================== ---- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ libmediacommon/medium.h (.../work/coolos_media) (Revision 523597) +--- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ libmediacommon/medium.h (.../work/coolos_media) (revision 525009) @@ -22,6 +22,7 @@ #include <qstring.h> #include <qstringlist.h> @@ -98,8 +98,8 @@ #endif Index: mediaimpl.cpp =================================================================== ---- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mediaimpl.cpp (.../work/coolos_media) (Revision 523597) +--- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mediaimpl.cpp (.../work/coolos_media) (revision 525009) @@ -226,6 +226,8 @@ mp_mounting = &medium; @@ -138,8 +138,8 @@ Index: kfile-plugin/kfile_media.desktop =================================================================== ---- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (Revision 523597) +--- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (revision 525009) @@ -57,4 +57,4 @@ Name[zh_TW]=媒體資訊 ServiceTypes=KFilePlugin @@ -148,8 +148,8 @@ +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted Index: kfile-plugin/kfilemediaplugin.cpp =================================================================== ---- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (Revision 523597) +--- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (revision 525009) @@ -64,12 +64,16 @@ addMimeType( "media/floppy_unmounted" ); addMimeType( "media/zip_unmounted" ); @@ -180,8 +180,8 @@ { Index: configure.in.in =================================================================== ---- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ configure.in.in (.../work/coolos_media) (Revision 523597) +--- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ configure.in.in (.../work/coolos_media) (revision 525009) @@ -90,6 +90,13 @@ if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) ) @@ -198,8 +198,8 @@ dbus=FOUND Index: mounthelper/kio_media_mounthelper.cpp =================================================================== ---- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (Revision 523597) +--- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (revision 525009) @@ -27,6 +27,7 @@ #include <dcopclient.h> #include <dcopref.h> @@ -294,8 +294,8 @@ #include "kio_media_mounthelper.moc" Index: mounthelper/Makefile.am =================================================================== ---- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mounthelper/Makefile.am (.../work/coolos_media) (Revision 523597) +--- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mounthelper/Makefile.am (.../work/coolos_media) (revision 525009) @@ -6,7 +6,7 @@ kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp @@ -307,8 +307,8 @@ Index: kcmodule/managermodule.cpp =================================================================== ---- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ kcmodule/managermodule.cpp (.../work/coolos_media) (Revision 523597) +--- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ kcmodule/managermodule.cpp (.../work/coolos_media) (revision 525009) @@ -39,15 +39,15 @@ QString hal_text = view->kcfg_HalBackendEnabled->text(); hal_text += " ("+i18n("No support for HAL on this system")+")"; @@ -329,8 +329,8 @@ } Index: Makefile.am =================================================================== ---- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ Makefile.am (.../work/coolos_media) (Revision 523597) +--- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ Makefile.am (.../work/coolos_media) (revision 525009) @@ -1,5 +1,5 @@ SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ - kfile-plugin kcmodule mimetypes services @@ -347,8 +347,8 @@ + $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot Index: propsdlgplugin/propertiespage.h =================================================================== ---- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (revision 525009) @@ -0,0 +1,46 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -398,8 +398,8 @@ +#endif Index: propsdlgplugin/media_propsdlgplugin.desktop =================================================================== ---- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (revision 525009) @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 @@ -410,8 +410,8 @@ +ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted Index: propsdlgplugin/propertiespagegui.ui.h =================================================================== ---- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (revision 525009) @@ -0,0 +1,22 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. @@ -437,8 +437,8 @@ + Index: propsdlgplugin/propsdlgshareplugin.h =================================================================== ---- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (revision 525009) @@ -0,0 +1,44 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -486,8 +486,8 @@ + Index: propsdlgplugin/Makefile.am =================================================================== ---- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/Makefile.am (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/Makefile.am (.../work/coolos_media) (revision 525009) @@ -0,0 +1,12 @@ +METASOURCES = AUTO + @@ -503,8 +503,8 @@ +media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp Index: propsdlgplugin/propertiespage.cpp =================================================================== ---- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (revision 525009) @@ -0,0 +1,217 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -725,8 +725,8 @@ +#include "propertiespage.moc" Index: propsdlgplugin/propertiespagegui.ui =================================================================== ---- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (revision 525009) @@ -0,0 +1,390 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>PropertiesPageGUI</class> @@ -1120,8 +1120,8 @@ +</UI> Index: propsdlgplugin/propsdlgshareplugin.cpp =================================================================== ---- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) -+++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (Revision 523597) +--- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0) ++++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (revision 525009) @@ -0,0 +1,100 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -1224,7 +1224,7 @@ +#include "propsdlgshareplugin.moc" + -Eigenschaftsänderungen: propsdlgplugin +Property changes on: propsdlgplugin ___________________________________________________________________ Name: svn:ignore + propertiespagegui.cpp @@ -1239,8 +1239,8 @@ Index: mediamanager/mediamanager.cpp =================================================================== ---- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mediamanager/mediamanager.cpp (.../work/coolos_media) (Revision 523597) +--- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mediamanager/mediamanager.cpp (.../work/coolos_media) (revision 525009) @@ -76,14 +76,15 @@ } @@ -1355,8 +1355,8 @@ const QPtrList<Medium> media = m_mediaList.list(); Index: mediamanager/halbackend.cpp =================================================================== ---- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mediamanager/halbackend.cpp (.../work/coolos_media) (Revision 523597) +--- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mediamanager/halbackend.cpp (.../work/coolos_media) (revision 525009) @@ -21,9 +21,16 @@ #include <stdlib.h> @@ -1450,14 +1450,27 @@ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -@@ -224,6 +244,14 @@ +@@ -220,10 +240,27 @@ + (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) + return; + ++ // if the device is locked do not act upon it ++ if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) ++ allowNotification=false; ++ ++ ++ // if the device is locked do not act upon it ++ if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) ++ allowNotification=false; ++ + /** @todo check exclusion list **/ /* Create medium */ Medium* medium = new Medium(udi, ""); + + QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); + kdDebug() << "automount " << options["automount"] << endl; -+ if (options["automount"] == "true") { ++ if (options["automount"] == "true" && allowNotification ) { + QString error = mount(medium); + if (!error.isEmpty()) + kdDebug() << "error " << error << endl; @@ -1465,7 +1478,7 @@ setVolumeProperties(medium); m_mediaList.addMedium(medium, allowNotification); -@@ -262,6 +290,12 @@ +@@ -262,6 +299,12 @@ m_mediaList.addMedium(medium, allowNotification); return; } @@ -1478,7 +1491,7 @@ } void HALBackend::RemoveDevice(const char *udi) -@@ -280,13 +314,37 @@ +@@ -280,13 +323,37 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition) { @@ -1519,7 +1532,7 @@ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ if (conditionName == "VolumeUnmountForced") ResetProperties(mediumUdi); -@@ -298,6 +356,7 @@ +@@ -298,6 +365,7 @@ /* Reset properties after unmounting */ if (conditionName == "VolumeUnmount") ResetProperties(mediumUdi); @@ -1527,7 +1540,7 @@ } void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) -@@ -335,7 +394,7 @@ +@@ -335,7 +403,7 @@ kdDebug(1219) << "HALBackend::setProperties" << endl; Medium* m = new Medium(mediumUdi, ""); @@ -1536,7 +1549,7 @@ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) setVolumeProperties(m); if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -@@ -363,6 +422,11 @@ +@@ -363,6 +431,11 @@ return; QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); @@ -1548,7 +1561,7 @@ medium->setName( generateName(libhal_volume_get_device_file(halVolume)) ); -@@ -458,7 +522,7 @@ +@@ -458,7 +531,7 @@ mimeType = "media/camera" + MOUNT_SUFFIX; medium->setIconName("camera" + MOUNT_ICON_SUFFIX); // get model from camera @@ -1557,7 +1570,7 @@ { if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -@@ -472,6 +536,12 @@ +@@ -472,6 +545,12 @@ default: medium->setIconName(QString::null); }; @@ -1570,7 +1583,7 @@ }; } medium->setMimeType(mimeType); -@@ -573,15 +643,30 @@ +@@ -573,15 +652,30 @@ /** @todo find name */ medium->setName("camera"); @@ -1603,7 +1616,7 @@ medium->setLabel(i18n("Camera")); } -@@ -643,4 +728,442 @@ +@@ -643,4 +737,456 @@ s_HALBackend->DeviceCondition(udi, condition_name); } @@ -1947,6 +1960,20 @@ +{ + const Medium* medium = m_mediaList.findById(_udi); + if (!medium) ++ { // now we get fancy: if the udi is no volume, it _might_ be a device with only one ++ // volume on it (think CDs) - so we're so nice to the caller to unmount that volume ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); ++ if (halDrive) ++ { ++ int numVolumes; ++ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); ++ LibHalVolume* halVolume = NULL; ++ if (numVolumes == 1) ++ medium = m_mediaList.findById( volumes[0] ); ++ } ++ } ++ ++ if ( !medium ) + return i18n("No such medium: %1").arg(_udi); + + if (!medium->isMounted()) @@ -2048,8 +2075,8 @@ #include "halbackend.moc" Index: mediamanager/mediamanager.h =================================================================== ---- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mediamanager/mediamanager.h (.../work/coolos_media) (Revision 523597) +--- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mediamanager/mediamanager.h (.../work/coolos_media) (revision 525009) @@ -28,6 +28,7 @@ #include "removablebackend.h" #include "mediadirnotify.h" @@ -2081,8 +2108,8 @@ Index: mediamanager/halbackend.h =================================================================== ---- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) -+++ mediamanager/halbackend.h (.../work/coolos_media) (Revision 523597) +--- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) ++++ mediamanager/halbackend.h (.../work/coolos_media) (revision 525009) @@ -104,6 +104,9 @@ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit gnome-utils

by root＠suse.de

Hello community, here is the log from the commit of package gnome-utils checked in at Sun Apr 2 12:41:57 CEST 2006. -------- --- GNOME/gnome-utils/gnome-utils.changes 2006-03-23 23:01:30.000000000 +0100 +++ gnome-utils/gnome-utils.changes 2006-03-31 22:20:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 31 22:19:45 CEST 2006 - danw(a)suse.de + +- DTRT if the user types an absolute path into the filename entry. + #162460 + +------------------------------------------------------------------- New: ---- gnome-utils-screenshot-abspath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-utils.spec ++++++ --- /var/tmp/diff_new_pack.Xtu8Mr/_old 2006-04-02 12:40:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Xtu8Mr/_new 2006-04-02 12:40:37.000000000 +0200 @@ -20,7 +20,7 @@ Obsoletes: gnome-utils2 Autoreqprov: on Version: 2.12.2 -Release: 20 +Release: 22 Summary: Basic Utilities for the GNOME 2.x Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.11/%{name}-%{version}.t… Source1: gnome-screenshot.desktop @@ -28,6 +28,7 @@ Patch18: screen-shot-error-dlg.diff Patch21: gnome-utils-strict-aliasing.patch Patch22: gnome-utils-logview-findbar-return.patch +Patch23: gnome-utils-screenshot-abspath.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 /usr/bin/touch @@ -119,6 +120,7 @@ %patch18 %patch21 %patch22 +%patch23 gnome-patch-translation-update %build @@ -200,6 +202,9 @@ %{prefix}/share/pixmaps %changelog -n gnome-utils +* Fri Mar 31 2006 - danw(a)suse.de +- DTRT if the user types an absolute path into the filename entry. + [#162460] * Thu Mar 23 2006 - gekker(a)suse.de - Add .desktop for gnome-screenshot applet (#159487) * Tue Feb 28 2006 - sbrabec(a)suse.cz ++++++ gnome-utils-screenshot-abspath.patch ++++++ --- gnome-screenshot/screenshot-dialog.c +++ gnome-screenshot/screenshot-dialog.c @@ -277,7 +277,10 @@ file_name = gtk_entry_get_text (GTK_ENTRY (dialog->filename_entry)); tmp = g_filename_from_utf8 (file_name, -1, NULL, NULL, NULL); - uri = g_build_filename (folder, tmp, NULL); + if (*tmp == '/') + uri = g_strdup_printf ("file://%s", tmp); + else + uri = g_build_filename (folder, tmp, NULL); g_free (folder); g_free (tmp); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

commit gnome-keyring-manager

by root＠suse.de

Hello community, here is the log from the commit of package gnome-keyring-manager checked in at Sun Apr 2 12:40:53 CEST 2006. -------- --- GNOME/gnome-keyring-manager/gnome-keyring-manager.changes 2006-02-17 23:56:43.000000000 +0100 +++ gnome-keyring-manager/gnome-keyring-manager.changes 2006-03-31 19:33:50.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Mar 31 19:32:58 CEST 2006 - sreeves(a)suse.de + +- Update .desktop file to only use valid categories and move to the Control Center + See + https://bugzilla.novell.com/show_bug.cgi?id=129432 + https://bugzilla.novell.com/show_bug.cgi?id=159780 + +------------------------------------------------------------------- Old: ---- gkm-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring-manager.spec ++++++ --- /var/tmp/diff_new_pack.M11pHR/_old 2006-04-02 12:40:34.000000000 +0200 +++ /var/tmp/diff_new_pack.M11pHR/_new 2006-04-02 12:40:34.000000000 +0200 @@ -15,13 +15,13 @@ %define prefix /opt/gnome %define sysconfdir /etc%{prefix} Version: 2.12.0 -Release: 5 +Release: 12 URL: http://gnomesupport.org/wiki/index.php/GNOME%20Keyring%20Manager%20Wiki Group: System/GUI/GNOME License: GPL Summary: GNOME Keyring Password Manager Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.12/%{name}-%{version}.tar.b… -Patch: gkm-desktop.patch +#Patch: gkm-desktop.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,7 +68,7 @@ %prep %setup -%patch +#%patch %build rename no nb po/no.* @@ -90,7 +90,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/share/icons/hicolor/48x48/apps cp %{prefix}/share/icons/hicolor/48x48/stock/generic/stock_keyring.png $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/48x48/apps/ #end hack -%suse_update_desktop_file gnome-keyring-manager +%suse_update_desktop_file -G "Key Management Tool" -r gnome-keyring-manager GNOME X-SuSE-ControlCenter-Personal %clean rm -rf $RPM_BUILD_ROOT @@ -112,6 +112,11 @@ %{prefix}/share/omf/gnome-keyring-manager %changelog -n gnome-keyring-manager +* Fri Mar 31 2006 - sreeves(a)suse.de +- Update .desktop file to only use valid categories and move to the Control Center + See + https://bugzilla.novell.com/show_bug.cgi?id=129432 + https://bugzilla.novell.com/show_bug.cgi?id=159780 * Fri Feb 17 2006 - sreeves(a)suse.de - Update .desktop file (Name, GenericName, Comment, DocPath) * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 3 months

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits April 2006