Hello community, here is the log from the commit of package scpm for openSUSE:Factory checked in at 2012-07-06 09:52:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scpm (Old) and /work/SRC/openSUSE:Factory/.scpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scpm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scpm/scpm.changes 2011-10-21 16:36:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scpm.new/scpm.changes 2012-07-06 09:52:36.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Jul 5 11:53:42 CEST 2012 - [email protected] + +- Remove obsolete buildrequires for lzma. +- Remove the empty %%clean line. + +------------------------------------------------------------------- +Wed Jul 4 12:37:46 CEST 2012 - [email protected] + +- Do the work SuSEconfig.scpm in post and thus get rid of this + SuSEconfig module (openfate#313547). +- Require awk for post code to work. +- Repackage as xz. +- Don't use 'using namespace' in headers. +- Remove useless typedefs that are ignored. +- Buildrequire graphviz-gnome for png output. + +------------------------------------------------------------------- Old: ---- scpm-1.1.7.tar.lzma New: ---- scpm-1.1.7.tar.xz scpm-constification.patch scpm-doc_config.patch scpm-no_using_in_header.patch scpm-remove_unneeded_typedef.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scpm.spec ++++++ --- /var/tmp/diff_new_pack.JnCmCQ/_old 2012-07-06 09:52:37.000000000 +0200 +++ /var/tmp/diff_new_pack.JnCmCQ/_new 2012-07-06 09:52:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scpm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: scpm -BuildRequires: doxygen gcc-c++ graphviz libjpeg-devel libpng-devel lzma mhash-devel +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: graphviz +BuildRequires: graphviz-gnome +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: mhash-devel +BuildRequires: xz Summary: System Configuration Profile Management -Version: 1.1.7 -Release: 10 -Group: System/Base License: GPL-2.0+ -Source: scpm-%{version}.tar.lzma +Group: System/Base +Version: 1.1.7 +Release: 0 +Source: %{name}-%{version}.tar.xz Source1: logrotate-scpm Patch1: scpm-fix_boot_script.patch Patch2: scpm-1.1.7-gcc44.patch Patch3: scpm-1.1.7-no_static_linking.patch Patch4: scpm-fix_link_order.patch Patch5: scpm-header.patch -Requires: diffutils textutils +Patch6: scpm-remove_unneeded_typedef.patch +Patch7: scpm-no_using_in_header.patch +Patch8: scpm-constification.patch +Patch9: scpm-doc_config.patch +Requires: diffutils +Requires: textutils +Requires(post): awk Recommends: logrotate Suggests: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,42 +55,25 @@ time. It is the successor of scheme management. - -Authors: --------- - Joachim Gleissner <[email protected]> - %package devel -License: GPL-2.0+ Summary: Header files and API documentation for SCPM -Provides: scpm:/usr/include/scpm.h -Requires: scpm Group: Development/Libraries/C and C++ +Provides: scpm:/usr/include/scpm.h +Requires: %{name} = %{version} %description devel This package is only needed if you want to compile applications that make use of libscpm. - -Authors: --------- - Joachim Gleissner <[email protected]> - %package lang -License: GPL-2.0+ Summary: Localized messages for scpm -Requires: scpm = %{version} Group: Development/Libraries/C and C++ +Requires: scpm = %{version} %description lang This package contains the localized messages for scpm. - -Authors: --------- - Joachim Gleissner <[email protected]> - %prep %setup -q %patch1 -p0 @@ -87,39 +81,40 @@ %patch3 %patch4 %patch5 -p1 +%patch6 +%patch7 +%patch8 +%patch9 %build -export CXXFLAGS="$RPM_OPT_FLAGS" -echo -e "#!/bin/bash\n`which %__cxx` \"\$@\"" >g++ +export CXXFLAGS="%{optflags}" +echo -e "#!/bin/bash\n$(which %__cxx) \"\$@\"" >g++ chmod 755 g++ export PATH=`pwd`:$PATH make %install -mkdir -p $RPM_BUILD_ROOT/%{_libdir} -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -mkdir -p $RPM_BUILD_ROOT/%{_var}/lib -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/include -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/locale/de/LC_MESSAGES -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/update-messages/en -#mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir} -mkdir -p $RPM_BUILD_ROOT/%{_infodir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir} -mkdir -p $RPM_BUILD_ROOT/sbin/conf.d -mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +mkdir -p %{buildroot}%{_libdir} +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_var}/lib +mkdir -p %{buildroot}%{_prefix}/include +mkdir -p %{buildroot}%{_datadir}/locale/de/LC_MESSAGES +mkdir -p %{buildroot}%{_datadir}/update-messages/en +mkdir -p %{buildroot}%{_defaultdocdir} +mkdir -p %{buildroot}%{_infodir} +mkdir -p %{buildroot}%{_mandir} +mkdir -p %{buildroot}/sbin/conf.d +mkdir -p %{buildroot}/etc/logrotate.d +mkdir -p %{buildroot}/var/adm/fillup-templates make PREFIX=%{buildroot} EXEC_PREFIX=%{_prefix} install -install -m 755 -d $RPM_BUILD_ROOT/%{_defaultdocdir}/scpm -install -m 755 SuSEconfig.scpm $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.scpm +install -m 755 -d %{buildroot}/%{_defaultdocdir}/scpm # work around until scpm gets autoconf'd if [ "%{_lib}" != "lib" ]; then - mv $RPM_BUILD_ROOT%{_prefix}/lib/libscpm* $RPM_BUILD_ROOT%{_libdir} + mv %{buildroot}%{_prefix}/lib/libscpm* %{buildroot}%{_libdir} fi -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/scpm -#install -m 644 update-message $RPM_BUILD_ROOT/usr/share/update-messages/en/scpm -mkdir -p $RPM_BUILD_ROOT/var/log -touch $RPM_BUILD_ROOT/var/log/scpm +install -m 644 %{SOURCE1} %{buildroot}/etc/logrotate.d/scpm +mkdir -p %{buildroot}/var/log +touch %{buildroot}/var/log/scpm %find_lang %name %post @@ -127,6 +122,20 @@ %{fillup_and_insserv -y boot.scpm} %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +INITIALIZED=$( scpm status | awk '{ if ($1 == "enabled") print $3 }' ) +test $INITIALIZED = no && exit 0 + +NEEDS_UPDATE=$( scpm status | awk '{ if (($1 == "needs") && ($2 == "reinit")) print $4 }' ) +test $NEEDS_UPDATE = no && exit 0 + +TMP=$(mktemp /tmp/scpm_update.XXXXXX) +test -z "$TMP" && TMP=/dev/stdout + +scpm -x db set 'status*system' "`head -n 1 /etc/SuSE-release`" > $TMP +scpm -x update_resources > $TMP + +test "$TMP" != "/dev/stdout" && rm -f $TMP + %postun /sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -139,7 +148,6 @@ %config /etc/logrotate.d/scpm %config /etc/bash_completion.d/scpm_completion.sh %{_sbindir}/scpm -/sbin/conf.d/SuSEconfig.scpm %{_libdir}/libscpm.so.* %{_prefix}/lib/scpm %{_mandir}/man8/scpm.8.gz @@ -164,7 +172,4 @@ %files lang -f %name.lang %defattr(-,root,root) -%clean -test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT - %changelog ++++++ scpm-constification.patch ++++++ Index: src/main/journal.cc =================================================================== --- src/main/journal.cc.orig 2012-07-04 17:43:59.446350529 +0200 +++ src/main/journal.cc 2012-07-04 17:56:28.941356454 +0200 @@ -91,7 +91,7 @@ Journal::~Journal() bool Journal::MakeLock( ) { - char *lockfile = "/var/lib/scpm/journal/lock"; + const char *lockfile = "/var/lib/scpm/journal/lock"; struct stat statbuf; if ( stat( lockfile, &statbuf ) == 0 ) { LOGWARN( "SCPM is already locked." ); ++++++ scpm-doc_config.patch ++++++ Index: doc/api.cf =================================================================== --- doc/api.cf.orig 2005-05-11 11:03:11.000000000 +0200 +++ doc/api.cf 2012-07-04 17:59:46.907607508 +0200 @@ -53,16 +53,6 @@ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -147,13 +137,6 @@ JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented # member inherits the documentation from any documented member that it # re-implements. @@ -608,12 +591,6 @@ HTML_FOOTER = footer.html HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - # If the GENERATE_HTMLHELP tag is set to YES, additional index files # will be generated that can be used as input for tools like the # Microsoft HTML help workshop to generate a compressed HTML help file (.chm) @@ -1105,22 +1082,6 @@ DOT_PATH = DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the # graphs generated by dot. A depth value of 3 means that only nodes reachable # from the root by following a path via at most 3 edges will be shown. Nodes that Index: doc/api.doxygen =================================================================== --- doc/api.doxygen.orig 2005-05-11 11:03:12.000000000 +0200 +++ doc/api.doxygen 2012-07-04 18:03:33.593169292 +0200 @@ -34,7 +34,7 @@ variable <dfn>scpm_error</dfn> holds the apropriate error message. */ -/*! \fn SCPM::SCPM( int options=0, ostream &info_out=cout, ostream &hash_out=cout, string root="") +/*! \fn SCPM::SCPM( int options=0, std::ostream &info_out=std::cout, std::ostream &hash_out=std::cout, std::string root="") \brief Constructor \param options Global SCPM options (optional) \param info_out Optional ostream object used for action information output @@ -373,10 +373,10 @@ them into the group refernence vector. */ -/*! \fn bool SCPM::GetResourceGroup( const string &name, vector<resource_entry_t> &group ) +/*! \fn bool SCPM::GetResourceGroup( const std::string &name, std::vector<resource_entry_t> &group ) \brief Queries resource group information \param name String holding the name of the wanted resource group - \param group Reference to vector<resource_entry_t> to get filled with the info + \param group Reference to std::vector<resource_entry_t> to get filled with the info \return success <p> @@ -521,10 +521,10 @@ for <em>BOOTMODE</em> and <em>SWITCHMODE</em>. */ -/*! \fn bool SCPM::GetResourceGroup( const string &name, vector<resource_entry_t> &group, string &description ) +/*! \fn bool SCPM::GetResourceGroup( const std::string &name, std::vector<resource_entry_t> &group, std::string &description ) \brief Queries resource group information \param name String holding the name of the wanted resource group - \param group Reference to vector<resource_entry_t> to get filled with the info + \param group Reference to std::vector<resource_entry_t> to get filled with the info \param description Reference to a string the groups description gets written to \return success <p> ++++++ scpm-no_using_in_header.patch ++++++ ++++ 2259 lines (skipped) ++++++ scpm-remove_unneeded_typedef.patch ++++++ Index: include/scpm_types.h =================================================================== --- include/scpm_types.h.orig 2006-09-21 14:36:16.000000000 +0200 +++ include/scpm_types.h 2012-07-04 16:50:39.302484063 +0200 @@ -29,13 +29,13 @@ #include <vector> #include <unistd.h> -typedef enum save_mode_t { +enum save_mode_t { normal, save_all, patch_all } ; -typedef struct resource_group_t { +struct resource_group_t { std::string name; std::string description; bool user_defined; @@ -43,14 +43,14 @@ typedef struct resource_group_t { bool active; } ; -typedef struct resource_entry_t { +struct resource_entry_t { std::string name; std::string type; bool active; bool user_defined; } ; -typedef struct resource_info_t { +struct resource_info_t { std::string resource_name; std::string resource_type; bool is_new; @@ -60,13 +60,13 @@ typedef struct resource_info_t { std::vector<resource_group_t> groups; } ; -typedef struct switch_info_t { +struct switch_info_t { bool profile_modified; std::string profile_name; std::vector<resource_info_t> modified_resources; } ; -typedef struct scpm_status_t { +struct scpm_status_t { bool initialized; bool enabled; bool db_loaded; @@ -81,14 +81,14 @@ typedef struct scpm_status_t { std::string db_format_version; } ; -typedef struct backup_info_t { +struct backup_info_t { std::string name; std::string type; std::string profile; std::vector< std::pair<time_t, std::string> > versions; } ; -typedef enum rebuild_mode_t { +enum rebuild_mode_t { REBUILD_MODE_QUICK, REBUILD_MODE_RESOURCES_ONLY, REBUILD_MODE_DATA_ONLY, Index: src/main/journal.hh =================================================================== --- src/main/journal.hh.orig 2006-09-26 13:44:42.000000000 +0200 +++ src/main/journal.hh 2012-07-04 16:50:39.303484039 +0200 @@ -28,14 +28,14 @@ public: friend class SCPM; - typedef enum status_t { + enum status_t { STATUS_CLEAN, STATUS_LOCKED, STATUS_STALE_LOCK, STATUS_RECOVER_NEEDED } ; - typedef struct entry { + struct entry { int command; std::vector<std::string> args; bool replay; @@ -90,8 +90,8 @@ public: static const int cmd_group_set_active = 66; // some exceptions - typedef struct no_more_entries{}; - typedef struct load_failed + struct no_more_entries{}; + struct load_failed { public: load_failed( std::string r ) { reason=r; }; Index: src/main/scpm_conf.hh =================================================================== --- src/main/scpm_conf.hh.orig 2005-12-13 17:30:15.000000000 +0100 +++ src/main/scpm_conf.hh 2012-07-04 17:43:16.922373756 +0200 @@ -74,8 +74,8 @@ public: void SetBootMode( bool value ) { boot_mode = value; }; // support for setting some options - typedef struct io_error{}; - typedef struct no_such_option{}; + struct io_error{}; + struct no_such_option{}; void SaveOption( const string &option, const string &value ) throw( io_error, no_such_option ); Index: src/scdb/scdb.hh =================================================================== --- src/scdb/scdb.hh.orig 2006-09-21 15:00:57.000000000 +0200 +++ src/scdb/scdb.hh 2012-07-04 17:43:16.922373756 +0200 @@ -38,18 +38,18 @@ public: typedef XMLNode backend_node; typedef LocalFile backend_file; - typedef struct dbinfo_t { + struct dbinfo_t { string version; string type; bool is_local; }; - typedef struct resource_dep_t { + struct resource_dep_t { string name; string type; }; - typedef struct db_action_failed + struct db_action_failed { public: db_action_failed( string r ) { reason = r; }; Index: src/scdb/scdb_util.hh =================================================================== --- src/scdb/scdb_util.hh.orig 2005-05-11 11:03:12.000000000 +0200 +++ src/scdb/scdb_util.hh 2012-07-04 17:43:16.922373756 +0200 @@ -26,7 +26,7 @@ class SCDBUtil public: SCDBUtil() { db = SCDB::GetHandle(); }; - typedef struct operation_failed + struct operation_failed { public: operation_failed( string r ) { reason = r; }; Index: src/scdb/xml.hh =================================================================== --- src/scdb/xml.hh.orig 2005-05-11 11:03:12.000000000 +0200 +++ src/scdb/xml.hh 2012-07-04 17:43:16.922373756 +0200 @@ -54,13 +54,13 @@ public: XML( ); ~XML( ); - typedef struct db_stats_t { + struct db_stats_t { int node_count; int deleted_node_count; long mem_usage; }; - typedef struct op_failed{}; + struct op_failed{}; XMLNode *GetRoot( ) { return root; }; string GetSCDBVersion( ) { return scdb_version_str; }; @@ -79,7 +79,7 @@ public: private: - typedef struct syntax_error + struct syntax_error { public: syntax_error( string k, string e, unsigned int l ) @@ -91,9 +91,9 @@ private: unsigned int line; }; - typedef struct end_of_tokens {}; + struct end_of_tokens {}; - typedef struct key_t { + struct key_t { string str; bool is_begin_token; bool is_end_token; Index: include/scdb.h =================================================================== --- include/scdb.h.orig 2012-07-04 17:43:16.921373780 +0200 +++ include/scdb.h 2012-07-04 17:43:43.310738785 +0200 @@ -31,18 +31,18 @@ public: friend class SCDBUtil; - typedef struct dbinfo_t { + struct dbinfo_t { string version; string type; bool is_local; }; - typedef struct resource_dep_t { + struct resource_dep_t { string name; string type; }; - typedef struct db_action_failed + struct db_action_failed { public: db_action_failed( string r ) { reason = r; }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
