Accepting request 36380 from GNOME:Factory

checked in (request 36380)

OBS-URL: https://build.opensuse.org/request/show/36380
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=47

libwnck-2.29.92.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e52bac253d387c7ae7ed16a6c0673e01915b89ede7567debef74c9fbd930ab8
+size 701367

libwnck-2.30.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d35bcc28548945915da4f5cafd0555606f972e236cc5f9dbb0186186dfbf5247
-size 705602

libwnck.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-Tue Mar 30 06:10:13 CEST 2010 - vuntz@opensuse.org
-
-- Update to version 2.30.0:
-  + Fixes
-    - Many GSeal-related fixes
-    - Use a GtkMenuSeparator with a label instead of a hack for
-      workspace menu items in selector
-  + Updated translations.
-
--------------------------------------------------------------------
-Mon Mar 22 15:34:07 CET 2010 - vuntz@opensuse.org
-
-- Remove manual check for the package name to follow the library
-  policy: rpmlint does this now.
-
--------------------------------------------------------------------
-Sun Mar 21 17:47:43 UTC 2010 - dimstar@opensuse.org
-
-- Add BuildRequires gobject-introspection-devel.
-
 -------------------------------------------------------------------
 Tue Mar  9 08:22:31 CET 2010 - dimstar@opensuse.org
 

libwnck.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libwnck (Version 2.30.0)
+# spec file for package libwnck (Version 2.29.92)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,33 +15,32 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
 
 Name:           libwnck
-Version:        2.30.0
-Release:        1
-License:        LGPL v2.1 or later
-# 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
-Summary:        Window Navigator Construction Kit (Library Package)
-Group:          Development/Libraries/GNOME
-Source:         %{name}-%{version}.tar.bz2
-Source1:        %{name}_spec-update.sh
-Source99:       baselibs.conf
 BuildRequires:  fdupes
-BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  licenses
-Requires:       %{name}-lang = %{version}
-Requires:       libwnck-1-22 = %{version}
-Requires:       licenses
 # bug437293
 %ifarch ppc64
 Obsoletes:      libwnck-64bit
 %endif
 #
+License:        LGPLv2.1+
+Group:          Development/Libraries/GNOME
+Version:        2.29.92
+Release:        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
+Summary:        Window Navigator Construction Kit (Library Package)
+Source:         %{name}-%{version}.tar.bz2
+Source1:        %{name}_spec-update.sh
+Source99:       baselibs.conf
+Requires:       libwnck-1-22 = %{version} licenses
+Requires:       %{name}-lang = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -49,7 +48,7 @@ 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
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Summary:        Window Navigator Construction Kit (Library Package)
 Group:          Development/Libraries/GNOME
 # Require translation package (%{name}) not older than the library:
@@ -65,12 +64,10 @@ The Window Navigator Construction Kit is a library that can be used to
 write task lists, pagers, and similar GNOME programs.
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version} glib2-devel gtk2-devel
-Requires:       glib2-devel
-Requires:       gtk2-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      libwnck-devel-64bit
@@ -89,7 +86,7 @@ to develop applications that require these.
 
 %build
 # needed for libwnck-2.19.4:
-export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure\
 	--disable-static
 %__make %{?jobs:-j%jobs}
@@ -99,18 +96,23 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
-rm %{buildroot}%{_libdir}/*.*a
+rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
 %find_lang %{name}
+LIBNAME="$(echo $RPM_BUILD_ROOT%{_libdir}/%{name}-*.so.?? | sed 's/.*\///;s/\.so\./-/;s/\./_/')"
+if test "$LIBNAME" != libwnck-1-22 ; then
+    echo "Library version does not match package name. It should be $LIBNAME."
+    exit 1
+fi
 for FILE in COPYING ; do
     MD5SUM=$(md5sum $FILE | sed 's/ .*//')
     if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then
         ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE
     fi
 done
-%fdupes %{buildroot}
+%fdupes $RPM_BUILD_ROOT
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -n libwnck-1-22 -p /sbin/ldconfig
 
@@ -127,8 +129,6 @@ rm -rf %{buildroot}
 %files -n libwnck-1-22
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/Wnck-1.0.typelib
-%{_datadir}/gir-1.0/Wnck-1.0.gir
 
 %files devel
 %defattr(-,root,root)