Mailinglist Archive: opensuse-commit (1423 mails)
| < Previous | Next > |
commit yast2-control-center for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 07 May 2012 22:54:00 +0200
- Message-id: <20120507205400.85AD52021E@hilbert.suse.de>
Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2012-05-07 22:53:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center", Maintainer is "TGoettlicher@xxxxxxxx"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2012-01-31 10:22:58.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new/yast2-control-center.changes
2012-05-07 22:53:59.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Apr 27 15:25:14 CEST 2012 - tgoettlicher@xxxxxxx
+
+- workaround for gcc 4.7
+- Version: 2.22.2
+
+-------------------------------------------------------------------
+Thu Mar 15 18:29:56 CET 2012 - aschnell@xxxxxxx
+
+- added missing include for gcc 4.7
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-2.22.1.tar.bz2
New:
----
yast2-control-center-2.22.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.lIlk6g/_old 2012-05-07 22:54:00.000000000 +0200
+++ /var/tmp/diff_new_pack.lIlk6g/_new 2012-05-07 22:54:00.000000000 +0200
@@ -18,16 +18,23 @@
Name: yast2-control-center
-Version: 2.22.1
+Version: 2.22.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.22.1.tar.bz2
+Source0: yast2-control-center-2.22.2.tar.bz2
Group: System/YaST
License: GPL-2.0
BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig
update-desktop-files yast2-devtools
BuildRequires: cmake
+%if 0%{?force_gcc_46}
+BuildRequires: gcc46
+BuildRequires: gcc46-c++
+%else
+BuildRequires: gcc-c++ >= 4.6
+%endif
+
Summary: YaST2 - Control Center
Requires: yast2 yast2-control-center-binary
Provides: y2c_menu y2m_menu yast2-menu
@@ -56,6 +63,11 @@
%build
mkdir build
cd build
+%if 0%{?force_gcc_46}
+export CC=gcc-4.6
+export CXX=g++-4.6
+%endif
+
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
++++++ yast2-control-center-2.22.1.tar.bz2 ->
yast2-control-center-2.22.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.22.1/VERSION.cmake
new/yast2-control-center-2.22.2/VERSION.cmake
--- old/yast2-control-center-2.22.1/VERSION.cmake 2012-01-30
16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/VERSION.cmake 2012-04-27
15:26:15.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "22")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.22.1/package/yast2-control-center.changes
new/yast2-control-center-2.22.2/package/yast2-control-center.changes
--- old/yast2-control-center-2.22.1/package/yast2-control-center.changes
2012-01-30 16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/package/yast2-control-center.changes
2012-04-27 15:26:15.000000000 +0200
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Fri Apr 27 15:25:14 CEST 2012 - tgoettlicher@xxxxxxx
+
+- workaround for gcc 4.7
+- Version: 2.22.2
+
+-------------------------------------------------------------------
+Thu Mar 15 18:29:56 CET 2012 - aschnell@xxxxxxx
+
+- added missing include for gcc 4.7
+
+-------------------------------------------------------------------
Mon Jan 30 16:46:38 CET 2012 - tgoettlicher@xxxxxxx
- Fixed bnc#742748: selected groups with keyboard
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.22.1/src/header.txt
new/yast2-control-center-2.22.2/src/header.txt
--- old/yast2-control-center-2.22.1/src/header.txt 2012-01-30
16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/src/header.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
- /****************************************************************************
-|
-| Copyright (c) [YEARS] Novell, Inc.
-| All Rights Reserved.
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of version 2 of the GNU General Public License as
-| published by the Free Software Foundation.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-| GNU General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, contact Novell, Inc.
-|
-| To contact Novell about this file by physical or electronic mail,
-| you may find current contact information at www.novell.com
-|
- \***************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.22.1/src/yqsavelogs.cpp
new/yast2-control-center-2.22.2/src/yqsavelogs.cpp
--- old/yast2-control-center-2.22.1/src/yqsavelogs.cpp 2012-01-30
16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/src/yqsavelogs.cpp 2012-04-27
15:26:15.000000000 +0200
@@ -31,6 +31,8 @@
#include "yqsavelogs.h"
+#include <unistd.h>
+
#include <QFileDialog>
#include <QMessageBox>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.22.1/yast2-control-center.spec.in
new/yast2-control-center-2.22.2/yast2-control-center.spec.in
--- old/yast2-control-center-2.22.1/yast2-control-center.spec.in
2012-01-30 16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/yast2-control-center.spec.in
2012-04-27 15:26:15.000000000 +0200
@@ -7,6 +7,14 @@
BuildRequires: libdrm-devel libjpeg-devel pkgconfig libqt4-devel
update-desktop-files yast2-devtools
BuildRequires: cmake
+%if 0%{?force_gcc_46}
+BuildRequires: gcc46
+BuildRequires: gcc46-c++
+%else
+BuildRequires: gcc-c++ >= 4.6
+%endif
+
+
Summary: YaST2 - Control Center
Requires: yast2 yast2-control-center-binary
Provides: y2c_menu y2m_menu yast2-menu
@@ -35,6 +43,11 @@
%build
mkdir build
cd build
+%if 0%{?force_gcc_46}
+export CC=gcc-4.6
+export CXX=g++-4.6
+%endif
+
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2012-05-07 22:53:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center", Maintainer is "TGoettlicher@xxxxxxxx"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2012-01-31 10:22:58.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new/yast2-control-center.changes
2012-05-07 22:53:59.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Apr 27 15:25:14 CEST 2012 - tgoettlicher@xxxxxxx
+
+- workaround for gcc 4.7
+- Version: 2.22.2
+
+-------------------------------------------------------------------
+Thu Mar 15 18:29:56 CET 2012 - aschnell@xxxxxxx
+
+- added missing include for gcc 4.7
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-2.22.1.tar.bz2
New:
----
yast2-control-center-2.22.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.lIlk6g/_old 2012-05-07 22:54:00.000000000 +0200
+++ /var/tmp/diff_new_pack.lIlk6g/_new 2012-05-07 22:54:00.000000000 +0200
@@ -18,16 +18,23 @@
Name: yast2-control-center
-Version: 2.22.1
+Version: 2.22.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.22.1.tar.bz2
+Source0: yast2-control-center-2.22.2.tar.bz2
Group: System/YaST
License: GPL-2.0
BuildRequires: libdrm-devel libjpeg-devel libqt4-devel pkgconfig
update-desktop-files yast2-devtools
BuildRequires: cmake
+%if 0%{?force_gcc_46}
+BuildRequires: gcc46
+BuildRequires: gcc46-c++
+%else
+BuildRequires: gcc-c++ >= 4.6
+%endif
+
Summary: YaST2 - Control Center
Requires: yast2 yast2-control-center-binary
Provides: y2c_menu y2m_menu yast2-menu
@@ -56,6 +63,11 @@
%build
mkdir build
cd build
+%if 0%{?force_gcc_46}
+export CC=gcc-4.6
+export CXX=g++-4.6
+%endif
+
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
++++++ yast2-control-center-2.22.1.tar.bz2 ->
yast2-control-center-2.22.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.22.1/VERSION.cmake
new/yast2-control-center-2.22.2/VERSION.cmake
--- old/yast2-control-center-2.22.1/VERSION.cmake 2012-01-30
16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/VERSION.cmake 2012-04-27
15:26:15.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "22")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.22.1/package/yast2-control-center.changes
new/yast2-control-center-2.22.2/package/yast2-control-center.changes
--- old/yast2-control-center-2.22.1/package/yast2-control-center.changes
2012-01-30 16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/package/yast2-control-center.changes
2012-04-27 15:26:15.000000000 +0200
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Fri Apr 27 15:25:14 CEST 2012 - tgoettlicher@xxxxxxx
+
+- workaround for gcc 4.7
+- Version: 2.22.2
+
+-------------------------------------------------------------------
+Thu Mar 15 18:29:56 CET 2012 - aschnell@xxxxxxx
+
+- added missing include for gcc 4.7
+
+-------------------------------------------------------------------
Mon Jan 30 16:46:38 CET 2012 - tgoettlicher@xxxxxxx
- Fixed bnc#742748: selected groups with keyboard
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.22.1/src/header.txt
new/yast2-control-center-2.22.2/src/header.txt
--- old/yast2-control-center-2.22.1/src/header.txt 2012-01-30
16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/src/header.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
- /****************************************************************************
-|
-| Copyright (c) [YEARS] Novell, Inc.
-| All Rights Reserved.
-|
-| This program is free software; you can redistribute it and/or
-| modify it under the terms of version 2 of the GNU General Public License as
-| published by the Free Software Foundation.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-| GNU General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, contact Novell, Inc.
-|
-| To contact Novell about this file by physical or electronic mail,
-| you may find current contact information at www.novell.com
-|
- \***************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-2.22.1/src/yqsavelogs.cpp
new/yast2-control-center-2.22.2/src/yqsavelogs.cpp
--- old/yast2-control-center-2.22.1/src/yqsavelogs.cpp 2012-01-30
16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/src/yqsavelogs.cpp 2012-04-27
15:26:15.000000000 +0200
@@ -31,6 +31,8 @@
#include "yqsavelogs.h"
+#include <unistd.h>
+
#include <QFileDialog>
#include <QMessageBox>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-2.22.1/yast2-control-center.spec.in
new/yast2-control-center-2.22.2/yast2-control-center.spec.in
--- old/yast2-control-center-2.22.1/yast2-control-center.spec.in
2012-01-30 16:48:14.000000000 +0100
+++ new/yast2-control-center-2.22.2/yast2-control-center.spec.in
2012-04-27 15:26:15.000000000 +0200
@@ -7,6 +7,14 @@
BuildRequires: libdrm-devel libjpeg-devel pkgconfig libqt4-devel
update-desktop-files yast2-devtools
BuildRequires: cmake
+%if 0%{?force_gcc_46}
+BuildRequires: gcc46
+BuildRequires: gcc46-c++
+%else
+BuildRequires: gcc-c++ >= 4.6
+%endif
+
+
Summary: YaST2 - Control Center
Requires: yast2 yast2-control-center-binary
Provides: y2c_menu y2m_menu yast2-menu
@@ -35,6 +43,11 @@
%build
mkdir build
cd build
+%if 0%{?force_gcc_46}
+export CC=gcc-4.6
+export CXX=g++-4.6
+%endif
+
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |