Hello community, here is the log from the commit of package meanwhile for openSUSE:Factory checked in at 2011-11-29 17:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meanwhile (Old) and /work/SRC/openSUSE:Factory/.meanwhile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meanwhile", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/meanwhile/meanwhile.changes 2011-11-23 19:36:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meanwhile.new/meanwhile.changes 2011-11-29 17:16:20.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Nov 28 23:55:25 UTC 2011 - [email protected] + +- Add meanwhile-glib-2.31.patch: Fix build with glib 2.31. +- Fix packaging: Do not package files in -doc and the library. + + Move any files out of the lib package that do not belong there. + This finally allows to have multiple libmeanwhil<n> installable + without conflicting on file level. + +------------------------------------------------------------------- +Wed Nov 23 14:30:45 UTC 2011 - [email protected] + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building +- Employ shlib packaging + +------------------------------------------------------------------- New: ---- meanwhile-glib-2.31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meanwhile.spec ++++++ --- /var/tmp/diff_new_pack.QgdUwa/_old 2011-11-29 17:16:21.000000000 +0100 +++ /var/tmp/diff_new_pack.QgdUwa/_new 2011-11-29 17:16:21.000000000 +0100 @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: meanwhile +%define lname libmeanwhile1 BuildRequires: glib2-devel libtool License: LGPL v2.1 or later Group: Development/Libraries/C and C++ @@ -27,59 +27,51 @@ Summary: Lotus Sametime Community Client Library Url: http://meanwhile.sf.net/ Source: %{name}-%{version}.tar.bz2 -Patch: meanwhile-status.diff +Patch0: meanwhile-status.diff +Patch1: meanwhile-glib-2.31.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Library to establish instant messaging connections to the Lotus Sametime IM server. +%package -n %lname +Summary: Lotus Sametime Community Client Library +Group: System/Libraries +# O/P added 2011-11-26 +Obsoletes: libmeanwhile < %version-%release +Provides: libmeanwhile = %version-%release - -Authors: --------- - Christopher (siege) O'Brien <[email protected]> +%description -n %lname +Library to establish instant messaging connections to the Lotus +Sametime IM server. %package devel -License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: Lotus Sametime Community Client library -Requires: %{name} = %{version} glib2-devel +Requires: %lname = %version, glib2-devel %description devel Library to establish instant messaging connections to the Lotus Sametime IM server. - - -Authors: --------- - Christopher (siege) O'Brien <[email protected]> - %package doc -License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: Lotus Sametime Community Client library -Requires: %{name} = %{version} %description doc Library to establish instant messaging connections to the Lotus Sametime IM server. - - -Authors: --------- - Christopher (siege) O'Brien <[email protected]> - %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build autoreconf -f -i %configure --disable-doxygen --disable-static -make %{?jobs:-j%jobs}\ +make %{?_smp_mflags} \ htmldocdir=%{_docdir}/%{name}/html\ latexdocdir=%{_docdir}/%{name}/latex\ sampledir=%{_docdir}/%{name}/samples @@ -90,30 +82,27 @@ latexdocdir=%{_docdir}/%{name}/latex\ sampledir=%{_docdir}/%{name}/samples # NEWS is empty -cp -a AUTHORS ChangeLog COPYING LICENSE README TODO $RPM_BUILD_ROOT%{_docdir}/%{name} rm -rf %{buildroot}%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files +%files -n %lname %defattr(-,root,root) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[ACLRT]* -%{_libdir}/*.so.* +%doc COPYING LICENSE README +%{_libdir}/libmeanwhile.so.1* %files devel %defattr(-,root,root) +%doc TODO ChangeLog README %{_includedir}/meanwhile %{_libdir}/*.so %{_libdir}/pkgconfig/meanwhile.pc %files doc %defattr(-,root,root) +%dir %{_docdir}/%{name} %{_docdir}/%{name}/samples %changelog ++++++ meanwhile-glib-2.31.patch ++++++ Index: meanwhile-1.0.2/samples/logging_proxy.c =================================================================== --- meanwhile-1.0.2.orig/samples/logging_proxy.c +++ meanwhile-1.0.2/samples/logging_proxy.c @@ -25,7 +25,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/glist.h> #include <mw_cipher.h> #include <mw_common.h> Index: meanwhile-1.0.2/samples/login_server.c =================================================================== --- meanwhile-1.0.2.orig/samples/login_server.c +++ meanwhile-1.0.2/samples/login_server.c @@ -19,7 +19,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/glist.h> #include <mw_cipher.h> #include <mw_common.h> Index: meanwhile-1.0.2/samples/nocipher_proxy.c =================================================================== --- meanwhile-1.0.2.orig/samples/nocipher_proxy.c +++ meanwhile-1.0.2/samples/nocipher_proxy.c @@ -29,7 +29,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/glist.h> #include <mw_common.h> #include <mw_message.h> Index: meanwhile-1.0.2/samples/redirect_server.c =================================================================== --- meanwhile-1.0.2.orig/samples/redirect_server.c +++ meanwhile-1.0.2/samples/redirect_server.c @@ -22,7 +22,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/glist.h> #include <mw_common.h> #include <mw_message.h> Index: meanwhile-1.0.2/src/channel.c =================================================================== --- meanwhile-1.0.2.orig/src/channel.c +++ meanwhile-1.0.2/src/channel.c @@ -19,8 +19,6 @@ */ #include <glib.h> -#include <glib/ghash.h> -#include <glib/glist.h> #include <string.h> #include "mw_channel.h" Index: meanwhile-1.0.2/src/mw_debug.c =================================================================== --- meanwhile-1.0.2.orig/src/mw_debug.c +++ meanwhile-1.0.2/src/mw_debug.c @@ -19,7 +19,7 @@ */ -#include <glib/gstring.h> +#include <glib.h> #include "mw_debug.h" Index: meanwhile-1.0.2/src/mw_message.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_message.h +++ meanwhile-1.0.2/src/mw_message.h @@ -22,7 +22,7 @@ #define _MW_MESSAGE_H -#include <glib/glist.h> +#include <glib.h> #include "mw_common.h" Index: meanwhile-1.0.2/src/mw_srvc_conf.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_srvc_conf.h +++ meanwhile-1.0.2/src/mw_srvc_conf.h @@ -22,7 +22,7 @@ #define _MW_SRVC_CONF_H -#include <glib/glist.h> +#include <glib.h> #include "mw_common.h" Index: meanwhile-1.0.2/src/mw_srvc_dir.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_srvc_dir.h +++ meanwhile-1.0.2/src/mw_srvc_dir.h @@ -22,7 +22,6 @@ #include <glib.h> -#include <glib/glist.h> #ifdef __cplusplus Index: meanwhile-1.0.2/src/mw_srvc_place.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_srvc_place.h +++ meanwhile-1.0.2/src/mw_srvc_place.h @@ -22,7 +22,7 @@ #define _MW_SRVC_PLACE_H -#include <glib/glist.h> +#include <glib.h> #include "mw_common.h" Index: meanwhile-1.0.2/src/mw_srvc_resolve.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_srvc_resolve.h +++ meanwhile-1.0.2/src/mw_srvc_resolve.h @@ -23,7 +23,6 @@ #include <glib.h> -#include <glib/glist.h> #ifdef __cplusplus Index: meanwhile-1.0.2/src/mw_st_list.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_st_list.h +++ meanwhile-1.0.2/src/mw_st_list.h @@ -30,7 +30,6 @@ #include <glib.h> -#include <glib/glist.h> #include "mw_common.h" Index: meanwhile-1.0.2/src/mw_util.h =================================================================== --- meanwhile-1.0.2.orig/src/mw_util.h +++ meanwhile-1.0.2/src/mw_util.h @@ -23,8 +23,6 @@ #include <glib.h> -#include <glib/ghash.h> -#include <glib/glist.h> #define map_guint_new() \ Index: meanwhile-1.0.2/src/srvc_aware.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_aware.c +++ meanwhile-1.0.2/src/srvc_aware.c @@ -19,8 +19,6 @@ */ #include <glib.h> -#include <glib/ghash.h> -#include <glib/glist.h> #include <string.h> #include "mw_channel.h" Index: meanwhile-1.0.2/src/srvc_conf.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_conf.c +++ meanwhile-1.0.2/src/srvc_conf.c @@ -19,8 +19,6 @@ */ #include <glib.h> -#include <glib/ghash.h> -#include <glib/glist.h> #include <stdio.h> #include <stdlib.h> Index: meanwhile-1.0.2/src/srvc_dir.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_dir.c +++ meanwhile-1.0.2/src/srvc_dir.c @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <glib/ghash.h> +#include <glib.h> #include "mw_channel.h" #include "mw_common.h" Index: meanwhile-1.0.2/src/srvc_ft.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_ft.c +++ meanwhile-1.0.2/src/srvc_ft.c @@ -19,7 +19,7 @@ */ -#include <glib/glist.h> +#include <glib.h> #include "mw_channel.h" #include "mw_common.h" Index: meanwhile-1.0.2/src/srvc_im.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_im.c +++ meanwhile-1.0.2/src/srvc_im.c @@ -19,7 +19,6 @@ */ #include <glib.h> -#include <glib/glist.h> #include <string.h> #include "mw_channel.h" Index: meanwhile-1.0.2/src/srvc_place.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_place.c +++ meanwhile-1.0.2/src/srvc_place.c @@ -19,8 +19,6 @@ */ #include <glib.h> -#include <glib/ghash.h> -#include <glib/glist.h> #include <stdio.h> #include <stdlib.h> Index: meanwhile-1.0.2/src/srvc_resolve.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_resolve.c +++ meanwhile-1.0.2/src/srvc_resolve.c @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <glib/ghash.h> +#include <glib.h> #include "mw_channel.h" #include "mw_common.h" Index: meanwhile-1.0.2/src/srvc_store.c =================================================================== --- meanwhile-1.0.2.orig/src/srvc_store.c +++ meanwhile-1.0.2/src/srvc_store.c @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <glib/glist.h> +#include <glib.h> #include "mw_channel.h" #include "mw_debug.h" Index: meanwhile-1.0.2/src/st_list.c =================================================================== --- meanwhile-1.0.2.orig/src/st_list.c +++ meanwhile-1.0.2/src/st_list.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <string.h> -#include <glib/gstring.h> +#include <glib.h> #include "mw_debug.h" #include "mw_util.h" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
