rpms/xfce4-panel/devel xfce4-panel.spec, 1.12, 1.13 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Thu Oct 5 02:10:26 UTC 2006
Author: kevin
Update of /cvs/extras/rpms/xfce4-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29556
Modified Files:
xfce4-panel.spec sources .cvsignore
Log Message:
Update to 4.4rc1/4.3.99.1
Index: xfce4-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/xfce4-panel.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xfce4-panel.spec 30 Aug 2006 04:17:58 -0000 1.12
+++ xfce4-panel.spec 5 Oct 2006 02:10:26 -0000 1.13
@@ -1,19 +1,18 @@
Summary: Next generation panel for Xfce
Name: xfce4-panel
-Version: 4.2.3
-Release: 7%{?dist}
+Version: 4.3.99.1
+Release: 3%{?dist}
License: GPL
URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce4-panel-4.2.3.tar.gz
-# Change default for Fedora
-Patch0: panel-launchmail.patch
-Patch1: panel-htmlview.patch
+Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-panel-4.3.99.1.tar.bz2
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-root
Requires: libxfcegui4 >= %{version}
Requires: libxfce4mcs >= %{version}
Requires: xfce-mcs-manager >= %{version}
Requires: libxml2 >= 2.4.0
+Requires: Terminal
+Requires: mousepad
BuildRequires: libxfcegui4-devel >= %{version}
BuildRequires: libxfce4mcs-devel >= %{version}
BuildRequires: xfce-mcs-manager-devel >= %{version}
@@ -22,16 +21,40 @@
BuildRequires: imake
BuildRequires: libXt-devel
BuildRequires: gettext
+# xfce4-iconbox isn't in Xfce 4.4
+Provides: xfce4-iconbox = %{version}-%{release}
+Obsoletes: xfce4-iconbox <= 4.2.3-4
+# xfce4-systray isn't in Xfce 4.4
+Provides: xfce4-systray = %{version}-%{release}
+Obsoletes: xfce4-systray <= 4.2.3-3
+# xfce4-toys isn't in Xfce 4.4
+Provides: xfce4-toys = %{version}-%{release}
+Obsoletes: xfce4-toys <= 4.2.3-3
+# xfce4-trigger-launcher isn't in Xfce 4.4
+Provides: xfce4-trigger-launcher = %{version}-%{release}
+Obsoletes: xfce4-trigger-launcher <= 4.2.3-3
+# xfce4-modemlights-plugin isn't in Xfce 4.4
+Provides: xfce4-modemlights-plugin = %{version}-%{release}
+Obsoletes: xfce4-modemlights-plugin <= 4.2.3-3
+# xfce4-showdesktop-plugin isn't in Xfce 4.4
+Provides: xfce4-showdesktop-plugin = %{version}-%{release}
+Obsoletes: xfce4-showdesktop-plugin <= 4.2.3-3
+# xfce4-taskbar-plugin isn't in Xfce 4.4
+Provides: xfce4-taskbar-plugin = %{version}-%{release}
+Obsoletes: xfce4-taskbar-plugin <= 4.2.3-3
+# xfce4-windowlist-plugin isn't in Xfce 4.4
+Provides: xfce4-windowlist-plugin = %{version}-%{release}
+Obsoletes: xfce4-windowlist-plugin <= 4.2.3-3
%description
This package includes the panel for the Xfce desktop environment
%package devel
-Summary: developpment headers for xfce4-panel
+Summary: Development headers for xfce4-panel
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: libxfce4util-devel >= 4.2.3.2-3
+Requires: libxfce4util-devel = %{version}
%description devel
This package includes the header files you will need to build
@@ -39,8 +62,6 @@
%prep
%setup -q
-%patch0 -p1 -b .launchmail
-%patch1 -p1 -b .htmlview
%build
%configure
@@ -51,39 +72,70 @@
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel-plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/xfce4/panel-plugins
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root)
-%doc README TODO ChangeLog NEWS NOTES COPYING AUTHORS
-/etc/xdg/xfce4
-%{_datadir}/xfce4/doc
+%doc README ChangeLog NEWS COPYING AUTHORS
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-10.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/panels.xml
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/xfce4-menu-5.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-9.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/clock-14.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-7.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/systray-4.rc
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/launcher-8.rc
+
%{_libdir}/xfce4
+%{_libdir}/libxfce4panel.so.*
%{_bindir}/*
-%{_datadir}/applications/*
+%{_libexecdir}/xfce4/panel-plugins
+%{_datadir}/xfce4/panel-plugins/
%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/xfce4/doc/C/xfce4-panel.html
+%{_datadir}/applications/xfce4-panel-manager.desktop
%files devel
%defattr(-, root, root)
%{_libdir}/pkgconfig/*
-%{_includedir}/xfce4/panel
+%{_libdir}/libxfce4panel.so
+%{_datadir}/gtk-doc/html/libxfce4panel
+%{_includedir}/xfce4/libxfce4panel
%changelog
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-7
-- Fix devel Requires to correct libxfce4util
-
-* Tue Aug 29 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-6
-- Add back in correct include dir for devel subpackage
+* Wed Oct 4 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-3
+- Add Requires for mousepad and Terminal
+- Bump for devel checkin
+
+* Sun Sep 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-2
+- Obsolete some more plugins who's functionality has been pulled in.
+- Own the libexecdir/xfce4/panel-plugins for new plugins.
+
+* Sun Sep 3 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.99.1-1
+- Update to 4.3.99.1
+- Add Provides/Obsoletes for xfce4-iconbox, xfce4-systray, xfce4-toys, xfce4-trigger-launcher
+- Fix typo in devel subpackage summary
+- Add post/postun ldconfig calls
+
+* Thu Aug 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2-2
+- fix .so in main package
+- add Requires for libxfce4util-devel
+- don't own includedir/xfce4 (libxfce4util-devel should)
-* Thu Aug 24 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-5
-- Don't own includedir/xfce4
-- Requires: libxfce4util-devel added to devel
+* Tue Jul 11 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.2
+- Upgrade to 4.3.90.2
-* Mon Jun 5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
-- Add gettext to BuildRequires (fixes #194139)
+* Thu Apr 27 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.90.1.fc6
+- Upgrade to 4.3.90.1
* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-3.fc5
- Rebuild for fc5
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Nov 2005 16:35:32 -0000 1.4
+++ sources 5 Oct 2006 02:10:26 -0000 1.5
@@ -1 +1 @@
-3027c4601f208d290a988befed66a49f xfce4-panel-4.2.3.tar.gz
+8647de295987605161c75650e4554fd8 xfce4-panel-4.3.99.1.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-panel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 12 Nov 2005 16:35:32 -0000 1.4
+++ .cvsignore 5 Oct 2006 02:10:26 -0000 1.5
@@ -1 +1 @@
-xfce4-panel-4.2.3.tar.gz
+xfce4-panel-4.3.99.1.tar.bz2
More information about the scm-commits
mailing list