From b2404b65e874952bc5e00e3032840c64e1f697a598baecd202cde97a30064d6c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 31 Mar 2011 08:47:08 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/libwnck revision 52.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=028db8674693df386d7aa927e877d93e --- libwnck.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwnck.spec b/libwnck.spec index 2f68dfb..7040bf0 100644 --- a/libwnck.spec +++ b/libwnck.spec @@ -19,7 +19,7 @@ Name: libwnck Version: 2.30.6 -Release: 5 +Release: 6 License: LGPLv2.1+ # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libwnck-1) From 9c5a1aa430fb736bef59b10106dc1bc4ea1d514f84441076b9f1720de63a95a9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 21 Apr 2011 09:01:01 +0000 Subject: [PATCH 2/3] Accepting request 67432 from GNOME:Next thanks OBS-URL: https://build.opensuse.org/request/show/67432 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=63 --- baselibs.conf | 2 +- libwnck-2.30.6.tar.bz2 | 3 --- libwnck-3.0.0.tar.bz2 | 3 +++ libwnck.changes | 48 ++++++++++++++++++++++++++++++++++++++++++ libwnck.spec | 38 +++++++++++++++------------------ 5 files changed, 69 insertions(+), 25 deletions(-) delete mode 100644 libwnck-2.30.6.tar.bz2 create mode 100644 libwnck-3.0.0.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 7a6ae80..2f73680 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libwnck-1-22 +libwnck-3-0 obsoletes "libwnck- <= " provides "libwnck- = " diff --git a/libwnck-2.30.6.tar.bz2 b/libwnck-2.30.6.tar.bz2 deleted file mode 100644 index 615b514..0000000 --- a/libwnck-2.30.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5 -size 724558 diff --git a/libwnck-3.0.0.tar.bz2 b/libwnck-3.0.0.tar.bz2 new file mode 100644 index 0000000..5975071 --- /dev/null +++ b/libwnck-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15 +size 750209 diff --git a/libwnck.changes b/libwnck.changes index 8cc3e2e..04d6e2f 100644 --- a/libwnck.changes +++ b/libwnck.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Wed Apr 6 11:04:04 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Updated translations. +- Changes from version 2.91.92: + + Require GTK+ 3.0 +- Changes from version 2.91.90: + + Fixes: + - Port widgets to GtkStyleContext + - Improve geometry management of WnckPager + - Add switching workspace on scroll events to WnckPager + - Fix crash when fetching some icons + - Make most of the code not assume the display is the + default one + - Code cleanups (Vincent) + + Misc: + - Add high-level documentation, with hints and examples (Vincent) + - Build fixes (Vincent) +- Changes from version 2.91.6: + + Major changes: + - Port to GTK+ 3 + - Enforce single include for libwnck + + API Changes: + - Drop previously deprecated API: + wnck_screen_get_workspace_index, + wnck_screen_get_workspace_neighbor, wnck_pager_set_screen, + wnck_tasklist_set_minimum_width, + wnck_tasklist_get_minimum_width, + wnck_tasklist_set_minimum_height, + wnck_tasklist_get_minimum_height, + wnck_tasklist_set_screen, wnck_gtk_window_set_dock_type, + wnck_create_window_action_menu + - Remove screen argument from + wnck_pager_new and wnck_tasklist_new + + Fixes: + - Fix link errors for wnckprop + - Start removing assumptions where default display was used + - Add missing introspection annotation + - Plug memory leak + + Updated translations. +- Rename libwnck-1-22 to libwnck-3-0 after library name change. +- Change gtk2-devel BuildRequires to gtk3-devel. +- Remove explicit glib2-devel and gtk2-devel Requires in devel + package: the right ones will be added the pkgconfig() way. +- Do not add -fno-strict-aliasing to CFLAGS anymore, it's not + needed. + ------------------------------------------------------------------- Mon Mar 21 16:56:00 UTC 2011 - coolo@novell.com diff --git a/libwnck.spec b/libwnck.spec index 7040bf0..8771735 100644 --- a/libwnck.spec +++ b/libwnck.spec @@ -18,12 +18,12 @@ Name: libwnck -Version: 2.30.6 -Release: 6 +Version: 3.0.0 +Release: 1 License: LGPLv2.1+ # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libwnck-1) -%define libwnck-1_name 22 +%define libwnck-3_name 0 Summary: Window Navigator Construction Kit (Library Package) Group: Development/Libraries/GNOME Source: %{name}-%{version}.tar.bz2 @@ -31,11 +31,11 @@ Source1: %{name}_spec-update.sh Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gobject-introspection-devel -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: intltool BuildRequires: translation-update-upstream Recommends: %{name}-lang -Requires: libwnck-1-22 = %{version} +Requires: libwnck-3-0 = %{version} # bug437293 %ifarch ppc64 Obsoletes: libwnck-64bit @@ -47,7 +47,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. -%package -n libwnck-1-22 +%package -n libwnck-3-0 License: LGPLv2.1+ Summary: Window Navigator Construction Kit (Library Package) Group: Development/Libraries/GNOME @@ -58,7 +58,7 @@ Obsoletes: libwnck-64bit %endif # -%description -n libwnck-1-22 +%description -n libwnck-3-0 The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. @@ -67,8 +67,6 @@ License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: glib2-devel -Requires: gtk2-devel # bug437293 %ifarch ppc64 Obsoletes: libwnck-devel-64bit @@ -87,11 +85,9 @@ translation-update-upstream # rpmlint note: libwnck has a separate translation for both Bengali and Bengali India %build -# needed for libwnck-2.19.4: -export CFLAGS="%{optflags} -fno-strict-aliasing" %configure\ - --disable-static -%__make %{?jobs:-j%jobs} + --disable-static +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall @@ -99,15 +95,15 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif rm %{buildroot}%{_libdir}/*.*a -%find_lang %{name} +%find_lang %{name}-3.0 %fdupes %{buildroot} %clean rm -rf %{buildroot} -%post -n libwnck-1-22 -p /sbin/ldconfig +%post -n libwnck-3-0 -p /sbin/ldconfig -%postun -n libwnck-1-22 -p /sbin/ldconfig +%postun -n libwnck-3-0 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -115,19 +111,19 @@ rm -rf %{buildroot} %{_bindir}/wnck-urgency-monitor %{_bindir}/wnckprop -%files lang -f %{name}.lang +%files lang -f %{name}-3.0.lang -%files -n libwnck-1-22 +%files -n libwnck-3-0 %defattr(-,root,root) %{_libdir}/*.so.* -%{_libdir}/girepository-1.0/Wnck-1.0.typelib +%{_libdir}/girepository-1.0/Wnck-3.0.typelib %files devel %defattr(-,root,root) -%{_includedir}/libwnck-1.0 +%{_includedir}/libwnck-3.0 %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so -%{_datadir}/gir-1.0/Wnck-1.0.gir +%{_datadir}/gir-1.0/Wnck-3.0.gir # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html From 63104f74821dbb81be27ea286f555853eb1bbbd22405e6fc2bc7c0519704cd3f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 21 Apr 2011 09:13:26 +0000 Subject: [PATCH 3/3] Accepting request 68031 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68031 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=64 --- libwnck.changes | 16 +++++++++++++--- libwnck.spec | 35 +++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/libwnck.changes b/libwnck.changes index 04d6e2f..dee9545 100644 --- a/libwnck.changes +++ b/libwnck.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 21 11:04:32 CEST 2011 - vuntz@opensuse.org + +- Add missing pkgconfig(libstartup-notification-1.0) BuildRequires. +- Move the small utilities to a tools subpackage, and remove the + libwnck binary package. +- Add libwnck Provides/Obsoletes to libwnck-3-0; this will also + help make the lang package installable. +- Change the libwnck Requires in devel package to libwnck-3-0. + ------------------------------------------------------------------- Wed Apr 6 11:04:04 UTC 2011 - fcrozat@novell.com @@ -13,10 +23,10 @@ Wed Apr 6 11:04:04 UTC 2011 - fcrozat@novell.com - Fix crash when fetching some icons - Make most of the code not assume the display is the default one - - Code cleanups (Vincent) + - Code cleanups + Misc: - - Add high-level documentation, with hints and examples (Vincent) - - Build fixes (Vincent) + - Add high-level documentation, with hints and examples + - Build fixes - Changes from version 2.91.6: + Major changes: - Port to GTK+ 3 diff --git a/libwnck.spec b/libwnck.spec index 8771735..57e5b2d 100644 --- a/libwnck.spec +++ b/libwnck.spec @@ -31,16 +31,10 @@ Source1: %{name}_spec-update.sh Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gobject-introspection-devel -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: intltool BuildRequires: translation-update-upstream -Recommends: %{name}-lang -Requires: libwnck-3-0 = %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: libwnck-64bit -%endif -# +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +45,8 @@ write task lists, pagers, and similar GNOME programs. License: LGPLv2.1+ Summary: Window Navigator Construction Kit (Library Package) Group: Development/Libraries/GNOME +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} Recommends: %{name}-lang # bug437293 %ifarch ppc64 @@ -62,11 +58,22 @@ Obsoletes: libwnck-64bit The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. +%package tools +License: LGPLv2.1+ +Summary: Window Navigator Construction Kit -- Tools +Group: Development/Libraries/GNOME + +%description tools +The Window Navigator Construction Kit is a library that can be used to +write task lists, pagers, and similar GNOME programs. + +This package provides some utilities based on libwnck. + %package devel License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME -Requires: %{name} = %{version} +Requires: libwnck-3-0 = %{version} # bug437293 %ifarch ppc64 Obsoletes: libwnck-devel-64bit @@ -105,9 +112,8 @@ rm -rf %{buildroot} %postun -n libwnck-3-0 -p /sbin/ldconfig -%files +%files tools %defattr(-,root,root) -%doc AUTHORS COPYING README NEWS ChangeLog %{_bindir}/wnck-urgency-monitor %{_bindir}/wnckprop @@ -115,18 +121,19 @@ rm -rf %{buildroot} %files -n libwnck-3-0 %defattr(-,root,root) +%doc AUTHORS COPYING README NEWS ChangeLog %{_libdir}/*.so.* %{_libdir}/girepository-1.0/Wnck-3.0.typelib %files devel %defattr(-,root,root) -%{_includedir}/libwnck-3.0 -%{_libdir}/pkgconfig/*.pc +%{_includedir}/libwnck-3.0/ +%{_libdir}/pkgconfig/libwnck-3.0.pc %{_libdir}/*.so %{_datadir}/gir-1.0/Wnck-3.0.gir # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/* +%{_datadir}/gtk-doc/html/libwnck-3.0/ %changelog