I have just updated spec-files-xfce so that it builds with the
latest 4.6.2 version of Xfce. The changes needed are in the attached
diff file (including a ChangeLog entry). I do notice a few issues like
the fact that the Xfce panel does not support a11y and the desktop
icons do not seem to display properly, but overall it works quite well
in my testing.
I do not have commit access to spec-files-xfce. Who is responsible
for this project, and can help me get these changes committed upstream?
Also, would it be possible for me to get commit access for helping
with ongoing maintenance and updating to new versions when they become
available?
Thanks,
Brian
Index: base-specs/xfwm4-themes.spec
===================================================================
--- base-specs/xfwm4-themes.spec (revision 32)
+++ base-specs/xfwm4-themes.spec (working copy)
@@ -14,7 +14,7 @@
%else
%define src_name xfwm4-themes
Version: 4.6.0
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Source0:
http://mocha.xfce.org/archive/xfce/4.6.1/src/%{src_name}-%{version}.tar.bz2
%endif
%prep
@@ -56,6 +56,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Update Source.
* Sun Aug 16 2009 - sobot...@gmail.com
- Version bumped to 4.6.0
* Mon Dec 10 2007 - sobot...@centrum.cz
Index: base-specs/xfprint.spec
===================================================================
--- base-specs/xfprint.spec (revision 32)
+++ base-specs/xfprint.spec (working copy)
@@ -13,8 +13,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name xfprint
-Version: %{xfce_version}
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Version: 4.6.1
+Source0:
http://mocha.xfce.org/archive/xfce/4.6.1/src//%{src_name}-%{version}.tar.bz2
%endif
%prep
@@ -60,6 +60,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Update source.
* Sun Aug 16 2009 - sobot...@gmail.com
- Version bumped to 4.6.1
* Mon Dec 10 2007 - sobot...@centrum.cz
Index: base-specs/xfce4-mixer.spec
===================================================================
--- base-specs/xfce4-mixer.spec (revision 32)
+++ base-specs/xfce4-mixer.spec (working copy)
@@ -13,8 +13,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name xfce4-mixer
-Version: %{xfce_version}
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Version: 4.6.1
+Source0:
http://mocha.xfce.org/archive/xfce/4.6.1/src/%{src_name}-%{version}.tar.bz2
%endif
%prep
@@ -56,6 +56,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Update Source.
* Sun Aug 16 2009 - sobot...@gmail.com
- Version bumped to 4.6.1
* Mon Dec 10 2007 - sobot...@centrum.cz
Index: base-specs/orage.spec
===================================================================
--- base-specs/orage.spec (revision 32)
+++ base-specs/orage.spec (working copy)
@@ -14,8 +14,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name orage
-Version: 4.4.2
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Version: 4.6.1
+Source0:
http://mocha.xfce.org/archive/xfce/4.6.1/src/%{src_name}-%{version}.tar.bz2
%endif
%prep
@@ -60,6 +60,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 4.6.1.
* Mon Dec 10 2007 - sobot...@centrum.cz
- Bump to 4.4.2
* Wed Apr 11 2007 - do...@truemail.co.th
Index: base-specs/xfce4-icon-theme.spec
===================================================================
--- base-specs/xfce4-icon-theme.spec (revision 32)
+++ base-specs/xfce4-icon-theme.spec (working copy)
@@ -13,8 +13,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name xfce4-icon-theme
-Version: 4.4.2
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Version: 4.4.3
+Source0:
http://mocha.xfce.org/archive/xfce/4.4.3/src/%{src_name}-%{version}.tar.bz2
%endif
%prep
@@ -56,6 +56,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Version bumped to 4.4.3
* Mon Dec 10 2007 - sobot...@centrum.cz
- Version bumped to 4.4.2
* Wed Apr 11 2007 - do...@truemail.co.th
Index: base-specs/thunar.spec
===================================================================
--- base-specs/thunar.spec (revision 32)
+++ base-specs/thunar.spec (working copy)
@@ -13,7 +13,7 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name Thunar
-Version: 1.0.1
+Version: 1.0.2
Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
%endif
Patch1: thunar-01-fixgccism.diff
@@ -21,7 +21,6 @@
Patch3: thunar-03-fixmoregccism.diff
Patch4: thunar-04-fixmoregccism2.diff
Patch5: thunar-05-fixgccismagain.diff
-Patch6: thunar-06-fixfilemode.diff
%prep
%if %svn_build
@@ -35,7 +34,6 @@
#%patch3 -p1
#%patch4 -p1
#%patch5 -p1
-%patch6 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -77,6 +75,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 1.0.2.
* Fri Aug 14 2009 - sobot...@gmail.com
- Fix missing definition of DEFFILEMODE.
* Sun Mar 01 2009 - sobot...@gmail.com
Index: base-specs/libxfce4mcs.spec
===================================================================
--- base-specs/libxfce4mcs.spec (revision 32)
+++ base-specs/libxfce4mcs.spec (working copy)
@@ -7,8 +7,8 @@
Summary: multi-channel settings management support for xfce
URL: http://www.xfce.org/
%define src_name libxfce4mcs
-Version: %{default_pkg_version}
-Source0: %{src_url}/libxfce4mcs-%{version}.tar.bz2
+Version: 4.4.3
+Source0:
http://mocha.xfce.org/archive/xfce/4.4.3/src/libxfce4mcs-%{version}.tar.bz2
Patch1: libxfce4mcs-01-fixgccism.diff
Group: Development/Libraries
@@ -46,6 +46,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Bump to 4.4.3.
* Sun Dec 21 2008 - sobot...@gmail.com
- Clean svn build method as we don't build from svn anymore
- As version use main version of Xfce release (defined in prod.inc)
Index: base-specs/libxfcegui4.spec
===================================================================
--- base-specs/libxfcegui4.spec (revision 32)
+++ base-specs/libxfcegui4.spec (working copy)
@@ -8,7 +8,7 @@
Summary: Various gtk widgets for xfce
URL: http://www.xfce.org/
%define src_name libxfcegui4
-Version: %{xfce_version}
+Version: 4.6.4
Source0: %{src_url}/libxfcegui4-%{version}.tar.bz2
Patch1: libxfcegui4-01-fixgccism.diff
Group: Development/Libraries
@@ -48,6 +48,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 4.6.4.
* Thu Aug 13 2009 - sobot...@gmail.com
- Update files section for version 4.6.1
* Sat Feb 28 2009 - sobot...@gmail.com
Index: base-specs/xfce4-panel.spec
===================================================================
--- base-specs/xfce4-panel.spec (revision 32)
+++ base-specs/xfce4-panel.spec (working copy)
@@ -17,7 +17,7 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name xfce4-panel
-Version: %{xfce_version}
+Version: 4.6.4
Source0: %{src_url}/xfce4-panel-%{version}.tar.bz2
%endif
Patch1: xfce4-panel-01-fixgccism.diff
@@ -68,6 +68,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump version to 4.6.4.
* Sun Mar 01 2009 - sobot...@gmail.com
- Bump version to 4.6.0
* Sun Dec 9 2007 - sobot...@centrum.cz
Index: base-specs/xfce4-settings.spec
===================================================================
--- base-specs/xfce4-settings.spec (revision 32)
+++ base-specs/xfce4-settings.spec (working copy)
@@ -8,7 +8,7 @@
Summary: Various gtk widgets for xfce
URL: http://www.xfce.org/
%define src_name xfce4-settings
-Version: %{xfce_version}
+Version: 4.6.5
Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
Group: Development/Libraries
@@ -43,5 +43,7 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 Brian Cameron brian.came...@oracle.com
+- Bump to 4.6.5.
* Sat 15 2009 Petr Sobotka sobot...@gmail.com
- Initial version
Index: base-specs/terminal.spec
===================================================================
--- base-specs/terminal.spec (revision 32)
+++ base-specs/terminal.spec (working copy)
@@ -13,8 +13,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name Terminal
-Version: 0.2.8
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Version: 0.2.12
+Source0:
http://mocha.xfce.org/archive/xfce/4.6.1/src/Terminal-%{version}.tar.bz2
%endif
Patch1: xfce-terminal-01-fixheaders.diff
Patch2: xfce-terminal-02-fixgccism.diff
@@ -61,6 +61,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 0.2.12
* Sun Dec 9 2007 - sobot...@centrum.cz
- Bump to 0.2.8
* Wed Apr 11 2007 - do...@truemail.co.th
Index: base-specs/gtk-xfce-engine.spec
===================================================================
--- base-specs/gtk-xfce-engine.spec (revision 32)
+++ base-specs/gtk-xfce-engine.spec (working copy)
@@ -15,7 +15,7 @@
Source0: %{src_name}-svn.tar
%else
%define src_name gtk-xfce-engine
-Version: 2.4.2
+Version: 2.6.0
Source0: %{src_url}/gtk-xfce-engine-%{version}.tar.bz2
%endif
@@ -60,6 +60,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 2.6.0.
* Sun Dec 09 2007 - sobot...@centrum.cz
- Bump to 2.4.2 version
* Wed Apr 11 2007 - do...@truemail.co.th
Index: base-specs/xfce-mcs-manager.spec
===================================================================
--- base-specs/xfce-mcs-manager.spec (revision 32)
+++ base-specs/xfce-mcs-manager.spec (working copy)
@@ -15,7 +15,7 @@
%else
%define src_name xfce-mcs-manager
Version: 4.4.2
-Source0: %{src_url}/xfce-mcs-manager-%{version}.tar.bz2
+Source0:
http://mocha.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-manager-%{version}.tar.bz2
%endif
Patch1: xfce-mcs-manager-01-fixgccism.diff
@@ -59,6 +59,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Fix Source.
* Wed Apr 11 2007 - do...@truemail.co.th
- Changed to multi-isa build method
- Version bumped to 4.4.1
Index: base-specs/mousepad.spec
===================================================================
--- base-specs/mousepad.spec (revision 32)
+++ base-specs/mousepad.spec (working copy)
@@ -14,8 +14,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name mousepad
-Version: 0.2.13
-Source0: %{src_url}/mousepad-%{version}.tar.bz2
+Version: 0.2.16
+Source0:
http://mocha.xfce.org/archive/xfce/4.6.1/src/mousepad-%{version}.tar.bz2
%endif
%prep
@@ -57,6 +57,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 0.2.16.
* Sun Dec 9 2007 - sobot...@centrum.cz
- Bump to 0.2.13
* Wed Apr 11 2007 - do...@truemail.co.th
Index: base-specs/libexo.spec
===================================================================
--- base-specs/libexo.spec (revision 32)
+++ base-specs/libexo.spec (working copy)
@@ -8,7 +8,7 @@
Summary: Application library for the Xfce desktop environment
URL: http://www.xfce.org/
%define src_name exo
-Version: 0.3.101
+Version: 0.3.107
Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
Patch1: libexo-01-fixgccism.diff
Patch2: libexo-04-pythonlib.diff
@@ -64,6 +64,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to version 0.3.107
* Sun Mar 01 2009 - sobot...@gmail.com
- Bump to version 0.3.100
* Sun Dec 9 2007 - sobot...@centrum.cz
Index: base-specs/xfce4-dev-tools.spec
===================================================================
--- base-specs/xfce4-dev-tools.spec (revision 32)
+++ base-specs/xfce4-dev-tools.spec (working copy)
@@ -9,8 +9,6 @@
Summary: Xfce Development Tools
URL: http://www.xfce.org/
%define src_name xfce4-dev-tools
-# This package was not upgraded in 4.6.1 release, so take 4.6.0 version
-#Version: %{default_pkg_version}
Version: 4.6.0
Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
Group: User Interface/Desktops
@@ -42,6 +40,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 4.6.0
* Sat Feb 28 2009 - sobot...@gmail.com
- Clean svn build method as we don't build from svn anymore
- As version use main version of Xfce release (defined in prod.inc)
Index: base-specs/xfconf.spec
===================================================================
--- base-specs/xfconf.spec (revision 32)
+++ base-specs/xfconf.spec (working copy)
@@ -10,11 +10,9 @@
Version: %{xfce_version}
Source0: %{src_url}/xfconf-%{version}.tar.bz2
Group: Development/Libraries
-Patch1: xfconf-01-fixgcc.diff
%prep
%setup -q -n %{src_name}-%{version}
-%patch1 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
Index: base-specs/xfce-mcs-plugins.spec
===================================================================
--- base-specs/xfce-mcs-plugins.spec (revision 32)
+++ base-specs/xfce-mcs-plugins.spec (working copy)
@@ -12,8 +12,8 @@
Source0: %{src_name}-svn.tar.bz2
%else
%define src_name xfce-mcs-plugins
-Version: 4.4.2
-Source0: %{src_url}/%{src_name}-%{version}.tar.bz2
+Version: 4.4.3
+Source0:
http://mocha.xfce.org/archive/xfce/4.4.3/src/%{src_name}-%{version}.tar.bz2
%endif
%prep
@@ -61,6 +61,8 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 03 2010 - brian.came...@oracle.com
+- Bump to 4.4.3.
* Wed Apr 11 2007 - do...@truemail.co.th
- Changed to multi-isa build method
- Version bumped to 4.4.1
Index: patches/libexo-01-fixgccism.diff
===================================================================
--- patches/libexo-01-fixgccism.diff (revision 32)
+++ patches/libexo-01-fixgccism.diff (working copy)
@@ -10,9 +10,9 @@
+G_GNUC_INTERNAL void exo_add_constants (PyObject *module,
+ const gchar *strip_prefix);
+G_GNUC_INTERNAL void exo_register_classes (PyObject *d);
+ DL_EXPORT(void) init_exo (void);
extern PyMethodDef exo_functions[];
-
--- exo-0.3.100/python/exo.override.fixgccism 2009-03-01 16:54:00.336218891
+0100
+++ exo-0.3.100/python/exo.override 2009-03-01 16:54:19.657103878 +0100
@@ -28,9 +28,9 @@
Index: patches/thunar-06-fixfilemode.diff
===================================================================
--- patches/thunar-06-fixfilemode.diff (revision 32)
+++ patches/thunar-06-fixfilemode.diff (working copy)
@@ -1,11 +0,0 @@
---- Thunar-1.0.1/thunar-vfs/thunar-vfs-io-jobs.c.fixfilemode 2009-08-14
19:12:10.471557037 +0200
-+++ Thunar-1.0.1/thunar-vfs/thunar-vfs-io-jobs.c 2009-08-14
19:12:36.181662170 +0200
-@@ -433,7 +433,7 @@
-
- again:
- /* try to create the file at the given path */
-- fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
-+ fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, "0666");
- if (G_UNLIKELY (fd < 0))
- {
- /* check if the file already exists */
Index: patches/xfconf-01-fixgcc.diff
===================================================================
--- patches/xfconf-01-fixgcc.diff (revision 32)
+++ patches/xfconf-01-fixgcc.diff (working copy)
@@ -1,40 +0,0 @@
---- xfconf-4.5.92/xfconfd/xfconf-locking-utils.h.fixgcc 2008-12-21
16:55:04.211486356 +0100
-+++ xfconf-4.5.92/xfconfd/xfconf-locking-utils.h 2008-12-21
16:55:29.272453373 +0100
-@@ -26,7 +26,7 @@
-
- #define XFCONF_DBUS_TYPE_G_DOUBLE_ARRAY
(dbus_g_type_get_collection("GArray", G_TYPE_DOUBLE))
-
--gboolean xfconf_user_is_in_list(const gchar *list) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL gboolean xfconf_user_is_in_list(const gchar *list);
-
- G_END_DECLS
-
---- xfconf-4.5.92/common/xfconf-gvaluefuncs.h.fixgcc 2008-12-21
16:51:25.731779096 +0100
-+++ xfconf-4.5.92/common/xfconf-gvaluefuncs.h 2008-12-21 16:53:01.353990909
+0100
-@@ -24,18 +24,18 @@
-
- G_BEGIN_DECLS
-
--GType _xfconf_gtype_from_string(const gchar *type) G_GNUC_INTERNAL;
--G_CONST_RETURN gchar *_xfconf_string_from_gtype(GType gtype) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL GType _xfconf_gtype_from_string(const gchar *type);
-+G_GNUC_INTERNAL G_CONST_RETURN gchar *_xfconf_string_from_gtype(GType gtype);
-
--gboolean _xfconf_gvalue_from_string(GValue *value,
-- const gchar *str) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL gboolean _xfconf_gvalue_from_string(GValue *value,
-+ const gchar *str);
-
--gchar *_xfconf_string_from_gvalue(GValue *value) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL gchar *_xfconf_string_from_gvalue(GValue *value);
-
--gboolean _xfconf_gvalue_is_equal(const GValue *value1,
-- const GValue *value2) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL gboolean _xfconf_gvalue_is_equal(const GValue *value1,
-+ const GValue *value2);
-
--void _xfconf_gvalue_free(GValue *value) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL void _xfconf_gvalue_free(GValue *value);
-
- G_END_DECLS
-
Index: OSOLxfcalendar.spec
===================================================================
--- OSOLxfcalendar.spec (revision 32)
+++ OSOLxfcalendar.spec (working copy)
@@ -71,12 +71,16 @@
%dir %attr (0755, root, sys) %{_datadir}
%{_datadir}/orage
%{_datadir}/xfce4
+%{_datadir}/dbus-1
%defattr(-,root,other)
%{_datadir}/icons
%{_datadir}/applications
%{_datadir}/locale
+%{_datadir}/man
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Fix packaging after updating to new version.
* Wed Apr 11 2007 - do...@truemail.co.th
- Changed to multi-isa build method
* Tue Apr 3 2007 - l...@sun.com
Index: OSOLlibexo.spec
===================================================================
--- OSOLlibexo.spec (revision 32)
+++ OSOLlibexo.spec (working copy)
@@ -91,14 +91,14 @@
%dir %attr (0755, root, bin) %{_datadir}/pygtk
%{_datadir}/xfce4/*
%{_datadir}/pygtk/*
-%dir %attr (0755, root, bin) %{_libdir}/python2.4
+%dir %attr (0755, root, bin) %{_libdir}/python2.6
%{_bindir}/*
%{_libdir}/lib*.so
%{_libdir}/lib*.so.*
%{_libdir}/exo-compose-mail-0.3
%{_libdir}/exo-helper-0.3
%{_libdir}/exo-mount-notify-0.3
-%{_libdir}/python2.4/*
+%{_libdir}/python2.6/*
%defattr(-,root,other)
%files root
@@ -123,6 +123,8 @@
%{_datadir}/gtk-doc/*
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Fix packaging after updating to new version.
* Wed Aug 19 2009 - sobot...@gmail.com
- Added IPS meta-tags required by juicer.
* Thu Aug 13 2009 - sobot...@gmail.com
Index: include/prod.inc
===================================================================
--- include/prod.inc (revision 32)
+++ include/prod.inc (working copy)
@@ -4,9 +4,9 @@
# Copyright 2007 Sun Microsystems, Inc.
#
SUNW_ProdName: XFCE
-SUNW_ProdVers: 4.6.1
+SUNW_ProdVers: 4.6.2
-%define default_pkg_version 4.6.1
+%define default_pkg_version 4.6.2
%{?xfce_version:#}%define xfce_version XFCEosol
%define default_category XFCE,application,%{xfce_version}
@@ -20,6 +20,8 @@
%define pkg_prefix OSOL
# ChangeLog:
+# 2010-08-03 Brian Cameron <brian.came...@oracle.com
+# - Bump to 4.6.2 version
# 2009-03-09 Petr Sobotka <sobot...@gmail.com>
# - Change download mirror url
# 2009-08-09 Petr Sobotka <sobot...@gmail.com>
Index: include/xfce.inc
===================================================================
--- include/xfce.inc (revision 32)
+++ include/xfce.inc (working copy)
@@ -3,7 +3,7 @@
# BEWARE that some config files will still be installed to /etc
# Default realease version
-%define xfce_version 4.6.1
+%define xfce_version 4.6.2
%define xfce_basedir /
%define xfce_prefix /opt/xfce
@@ -27,6 +27,8 @@
%define system_includedir %{system_prefix}/include
#changelog
+#* Tue Aug 03 2010 - brian.came...@oracle.com
+#- Bump to 4.6.2.
#* Sun Mar 01 2009 - sobot...@gmail.com
#- Add system path for installing helper packages to /usr/...
#- Take look for example at OSOLperl-uri
Index: OSOLxfce-loginmgr.spec
===================================================================
--- OSOLxfce-loginmgr.spec (revision 32)
+++ OSOLxfce-loginmgr.spec (working copy)
@@ -2,9 +2,12 @@
# Copyright (c) 2006 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
+%include Solaris.inc
%include xfce.inc
-%include Solaris.inc
+#include base.inc
+%define src_name xfce-loginmgr
+
Name: OSOLxfce-loginmgr
Summary: gdm and dtlogin files to support Xfce
URL: http://www.opensolaris.org/
@@ -49,6 +52,8 @@
%{_datadir}/*
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Fix includes.
* Wed Apr 11 2007 - do...@truemail.co.th
- Changed to multi-isa build method
* Fri Feb 9 2007 - do...@truemail.co.th
Index: ChangeLog
===================================================================
--- ChangeLog (revision 32)
+++ ChangeLog (working copy)
@@ -1,6 +1,34 @@
+2010-08-04 Brian Cameron <brian.came...@oracle.com>
+
+ * include/prod.inc, include/xfce.inc: Bump default build number to
+ 4.6.2.
+ * OSOLxfcalendar.spec, base-specs/orage.spec: Bump to 4.6.1
+ * OSOLlibexo.spec, base-specs/libexo.spec,
+ patches/libexo-01-fixgccism.diff: Bump to 0.3.107 and remove upstream
+ patch.
+ * OSOLxfce-loginmgr.spec: Add include of base.inc.
+ * OSOLxfce4-appfinder.spec: Add Requires on OSOLthunar.
+ * base-specs/xfce4-settings.spec: Bump to 4.6.5.
+ * base-specs/libxfcegui4.spec, base-specs/xfce4-panel.spec: Bump to
+ 4.6.4.
+ * base-specs/xfce4-dev-tools.spec: Bump to 4.6.0.
+ * base-specs/xfce4-icon-theme.spec, base-specs/xfce-mcs-plugins.spec,
+ base-specs/libxfce4mcs.spec: Bump to 4.4.3
+ * base-specs/gtk-xfce-engine.spec: Bump to 2.6.0.
+ * base-specs/thunar.spec, patches/thunar-06-fixfilemode.diff: Bump to
+ 1.0.2 and remove upstream patch.
+ * base-specs/mousepad.spec: Bump to 0.2.16.
+ * base-specs/terminal.spec: Bump to 0.2.12.
+ * base-specs/xfconf.spec, patches/xfconf-01-fixgcc.diff: Remove
+ upstream patch.
+ * base-specs/xfwm4-themes.spec, base-specs/xfprint.spec,
+ base-specs/xfce-mixer.spec, base-specs/xfce-mcs-manager.spec:
+ Update Source.
+
2009-09-21 Petr Sobotka <sobot...@gmail.com>
- * OSOLlibxfcegui4.spec: Add check if files for glade3 should be
delivered.
+ * OSOLlibxfcegui4.spec: Add check if files for glade3 should be
+ delivered.
2009-09-03 Petr Sobotka <sobot...@gmail.com>
Index: OSOLxfce4-appfinder.spec
===================================================================
--- OSOLxfce4-appfinder.spec (revision 32)
+++ OSOLxfce4-appfinder.spec (working copy)
@@ -21,7 +21,9 @@
BuildRequires: OSOLxfce4-dev-tools
BuildRequires: OSOLlibxfcegui4-devel
+BuildRequires: OSOLthunar
Requires: OSOLlibxfcegui4
+Requires: OSOLthunar
Requires: SUNWpostrun
%prep
@@ -71,6 +73,8 @@
%{_datadir}/locale
%changelog
+* Wed Aug 04 2010 - brian.came...@oracle.com
+- Add requires on OSOLthunar.
* Sun Aug 16 2009 - sobot...@gmail.com
- Modify files section for version 4.6.1
* Wed Apr 11 2007 - do...@truemail.co.th
_______________________________________________
desktop-discuss mailing list
desktop-discuss@opensolaris.org
