diff --git a/libwnck.spec b/libwnck.spec index d511072..e0d4414 100644 --- a/libwnck.spec +++ b/libwnck.spec @@ -1,26 +1,19 @@ -%define glib2_version 2.16.0 -%define gtk2_version 2.11.3 -%define pango_version 1.8.0 -%define startup_notification_version 0.5 - Summary: Window Navigator Construction Kit Name: libwnck Version: 2.30.3 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://download.gnome.org/sources/libwnck/ #VCS: git:git://git.gnome.org/libwnck Source0: http://download.gnome.org/sources/libwnck/2.30/%{name}-%{version}.tar.bz2 License: LGPLv2+ Group: System Environment/Libraries -Requires: glib2 >= %{glib2_version} -Requires: gtk2 >= %{gtk2_version} -Requires: startup-notification >= 0.5 +Requires: startup-notification -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: startup-notification-devel >= %{startup_notification_version} +BuildRequires: glib2-devel +BuildRequires: gtk2-devel +BuildRequires: pango-devel +BuildRequires: startup-notification-devel BuildRequires: libXt-devel BuildRequires: libXres-devel BuildRequires: gettext @@ -28,7 +21,6 @@ BuildRequires: intltool %description - libwnck (pronounced "libwink") is used to implement pagers, tasklists, and other such things. It allows applications to monitor information about open windows, workspaces, their names/icons, and so forth. @@ -36,37 +28,23 @@ about open windows, workspaces, their names/icons, and so forth. %package devel Summary: Libraries and headers for libwnck Group: Development/Libraries -Requires: %name = %{version}-%{release} - -Requires: glib2-devel >= %{glib2_version} -Requires: pango-devel >= %{pango_version} -Requires: gtk2-devel >= %{gtk2_version} -Requires: libXres-devel -Requires: startup-notification-devel >= %{startup_notification_version} +Requires: %{name} = %{version}-%{release} %description devel -libwnck (pronounced "libwink") is used to implement pagers, tasklists, -and other such things. It allows applications to monitor information -about open windows, workspaces, their names/icons, and so forth. - -You should install the libwnck-devel package if you would like to -compile applications that use libwnck. You don't need libwnck-devel -just to use precompiled applications. +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %prep %setup -q %build -%configure -make +%configure --disable-static +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %find_lang %{name} @@ -74,17 +52,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING README NEWS %{_libdir}/lib*.so.* %{_bindir}/wnck-urgency-monitor %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/wnckprop %{_libdir}/lib*.so %{_libdir}/pkgconfig/* @@ -92,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc %changelog +* Sat Sep 11 2010 Parag Nemade 2.30.3-3 +- Merge-review cleanup (#226059) + * Mon Aug 23 2010 Matthias Clasen - 2.30.3-2 - Co-own /usr/share/gtk-doc (#604398)