author | fujiwara |
Wed, 04 Feb 2009 08:46:07 +0000 | |
changeset 15011 | c181f6833139 |
parent 15009 | 9cd4a1ffe12d |
child 15016 | 8f2cbe0f65ce |
permissions | -rw-r--r-- |
9397 | 1 |
# |
2 |
# spec file for package SUNWgnome-dtlogin-integration |
|
3 |
# |
|
4 |
# includes module(s): dtlogin-integration |
|
5 |
# |
|
15009 | 6 |
# Copyright 2009 Sun Microsystems, Inc. |
9397 | 7 |
# This file and all modifications and additions to the pristine |
8 |
# package are under the same license as the package itself. |
|
9 |
# |
|
10 |
# Owner: laca |
|
11 |
# |
|
12 |
%define dtlogin_config_basedir /usr |
|
11390 | 13 |
# NOTE: If the version is bumped the new tarball must be uploaded to the |
14 |
# Sun Download Center. Contact GNOME RE for assistance. |
|
14410 | 15 |
%define tarball_version 0.37 |
9397 | 16 |
|
17 |
%include Solaris.inc |
|
15009 | 18 |
#%if %option_with_dt |
9397 | 19 |
Name: SUNWgnome-dtlogin-integration |
20 |
SourcePackage: SUNWgnome-dtlogin-integ-src |
|
21 |
Summary: dtlogin configuration files for the JDS desktop |
|
15009 | 22 |
#%else |
23 |
#Name: SUNWgnome-dtstart |
|
24 |
#Summary: Desktop startup scripts for JDS |
|
25 |
#%endif |
|
9397 | 26 |
Version: %{default_pkg_version} |
10008
a8968d0e9b04
change download url from gnome.org/~laca to dlc.sun.com/.../extras
laca
parents:
9984
diff
changeset
|
27 |
Source: http://dlc.sun.com/osol/jds/downloads/extras/dtlogin-integration-%{tarball_version}.tar.bz2 |
9643 | 28 |
Source1: l10n-configure.sh |
15009 | 29 |
Source2: dtstart |
30 |
Source11: 0010.env |
|
31 |
Source12: 0020.pre-localization |
|
32 |
Source13: 0060.sockets |
|
33 |
Source14: 0070.dbus |
|
34 |
Source15: 0110.fonts |
|
35 |
Source16: 0120.xrdb |
|
36 |
Source17: 0210.im |
|
37 |
Patch1: %{name}-01-g11n-migration.diff |
|
9397 | 38 |
SUNW_BaseDir: %{dtlogin_config_basedir} |
11965 | 39 |
SUNW_Copyright: SUNWgnome-dtlogin-integration.copyright |
9397 | 40 |
BuildRoot: %{_tmppath}/%{name}-%{version}-build |
41 |
%include default-depend.inc |
|
42 |
Requires: SUNWgnome-panel |
|
43 |
Requires: SUNWgnome-session |
|
44 |
Requires: SUNWgnome-wm |
|
45 |
||
15009 | 46 |
%package -n SUNWdesktop-startup |
15011 | 47 |
Summary: Desktop startup scripts in xinitrc.d |
48 |
SUNW_BaseDir: / |
|
15009 | 49 |
%include default-depend.inc |
50 |
Requires: SUNWgnome-panel |
|
51 |
Requires: SUNWgnome-session |
|
52 |
Requires: SUNWgnome-wm |
|
53 |
||
54 |
||
9397 | 55 |
%prep |
56 |
%setup -q -n dtlogin-integration-%{tarball_version} |
|
57 |
||
12012 | 58 |
bash -x %SOURCE1 --enable-sun-linguas |
9397 | 59 |
|
15009 | 60 |
%patch1 -p1 |
61 |
||
9397 | 62 |
%build |
63 |
export LDFLAGS="%_ldflags" |
|
64 |
export CFLAGS="%optflags" |
|
65 |
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal" |
|
66 |
libtoolize -f |
|
10407 | 67 |
intltoolize --force --copy --automake |
12031 | 68 |
|
69 |
%if %build_l10n |
|
70 |
bash -x %SOURCE1 --enable-copyright |
|
71 |
%endif |
|
72 |
||
9397 | 73 |
aclocal $ACLOCAL_FLAGS |
74 |
autoconf |
|
75 |
automake -acf |
|
76 |
||
77 |
./configure --with-gnome-prefix=%{_prefix} \ |
|
78 |
--prefix=%{dtlogin_config_basedir} |
|
79 |
||
80 |
%install |
|
10569 | 81 |
rm -rf $RPM_BUILD_ROOT |
82 |
%if %option_with_gnu_iconv |
|
83 |
make install DESTDIR=$RPM_BUILD_ROOT ICONV=/usr/gnu/bin/iconv ENCODING=UTF-8 |
|
84 |
%else |
|
9397 | 85 |
make install DESTDIR=$RPM_BUILD_ROOT |
10569 | 86 |
%endif |
9397 | 87 |
|
10569 | 88 |
%if %option_without_dt |
89 |
rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/appconfig |
|
90 |
rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/C |
|
91 |
rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/[a-z][a-z]* |
|
92 |
rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/Xsession* |
|
93 |
%endif |
|
94 |
||
15009 | 95 |
install --mode=0755 -d $RPM_BUILD_ROOT/usr/bin |
96 |
install --mode=0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/dtstart |
|
97 |
||
14410 | 98 |
# Create dbus session initialisation script for dtlogin |
15009 | 99 |
#%if %option_with_dt |
14410 | 100 |
install --mode=0755 -d $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d |
15009 | 101 |
install --mode=0755 %SOURCE14 $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d |
102 |
#%endif |
|
103 |
||
104 |
# rough script number? |
|
105 |
# 1 - 50: pre configurations |
|
106 |
# 51 - 100: pre processes |
|
107 |
# 101 - 150: post configurations |
|
108 |
# 151 - 200: post processes |
|
109 |
||
110 |
install --mode=0755 -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ |
|
111 |
install --mode=0755 -d $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d |
|
112 |
for FILE in %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE15 %SOURCE16 %SOURCE17 |
|
113 |
do |
|
114 |
install --mode=0755 $FILE $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d |
|
115 |
install --mode=0755 $FILE $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d |
|
116 |
done |
|
14410 | 117 |
|
9397 | 118 |
rm -rf $RPM_BUILD_ROOT/tmp |
119 |
||
120 |
%clean |
|
121 |
rm -rf $RPM_BUILD_ROOT |
|
122 |
||
123 |
%files |
|
124 |
%defattr (-, root, bin) |
|
125 |
%{dtlogin_config_basedir}/dt |
|
15009 | 126 |
#%if %option_with_dt |
127 |
#%else |
|
128 |
#%dir %attr (0755, root, bin) %{_bindir} |
|
129 |
#%{_bindir}/dtstart |
|
130 |
#%endif |
|
131 |
||
132 |
%files -n SUNWdesktop-startup |
|
133 |
%defattr (-, root, bin) |
|
134 |
%dir %attr(0755, root, sys) /etc |
|
135 |
%dir %attr(0755, root, sys) /etc/X11 |
|
136 |
%dir %attr(0755, root, sys) /etc/X11/xinit |
|
137 |
%dir %attr(0755, root, sys) /etc/X11/xinit/xinitrc.d |
|
138 |
/etc/X11/xinit/xinitrc.d/* |
|
139 |
%dir %attr (0755, root, sys) /usr |
|
10569 | 140 |
%dir %attr (0755, root, bin) %{_bindir} |
141 |
%{_bindir}/dtstart |
|
9397 | 142 |
|
14410 | 143 |
|
9397 | 144 |
%changelog |
15009 | 145 |
* Wed Feb 04 2009 - [email protected] |
146 |
- Add SUNWdesktop-startup for xinitrc.d scripts. |
|
147 |
- Add patch g11n-migration.diff |
|
14410 | 148 |
* Thu Oct 02 2008 - [email protected] |
149 |
- Bump up tarball to 0.37. Removed dtlogin-integration-02-dbus-launch.diff |
|
150 |
and dtlogin-integration-01-vte-cjk.diff which are now upstreamed. |
|
13693 | 151 |
* Fri Sep 19 2008 - [email protected] |
152 |
- Added dtlogin-integration-02-dbus-launch.diff to fix 6750408. |
|
13548 | 153 |
* Thu Sep 11 2008 - [email protected] |
154 |
- Add dtlogin-integration-01-vte-cjk.diff to fix 6745785. |
|
13329
aa15dfd735c0
2008-08-29 local account <set EMAIL_ADDRESS environment variable>
gheet
parents:
13308
diff
changeset
|
155 |
* Fri Aug 29 2008 - [email protected] |
aa15dfd735c0
2008-08-29 local account <set EMAIL_ADDRESS environment variable>
gheet
parents:
13308
diff
changeset
|
156 |
- Released 0.36 tarball and remove these patches |
aa15dfd735c0
2008-08-29 local account <set EMAIL_ADDRESS environment variable>
gheet
parents:
13308
diff
changeset
|
157 |
- SUNWgnome-dtlogin-integration-01-no-mo.diff |
aa15dfd735c0
2008-08-29 local account <set EMAIL_ADDRESS environment variable>
gheet
parents:
13308
diff
changeset
|
158 |
- SUNWgnome-dtlogin-integration-02-ssh-agent.diff |
aa15dfd735c0
2008-08-29 local account <set EMAIL_ADDRESS environment variable>
gheet
parents:
13308
diff
changeset
|
159 |
- SUNWgnome-dtlogin-integration-03-dbus-launch.diff |
13308 | 160 |
* Thu Aug 28 2008 - [email protected] |
161 |
- Added script to launch dbus session bus now that gnome-session does not do that. |
|
12873 | 162 |
* Mon Jul 21 2008 - [email protected] |
163 |
- Not start ssh-agent because gnome-keyring-daemon has added this feature. |
|
11991 | 164 |
* Tue Apr 1 2008 - [email protected] |
165 |
- Remove 'BuildRequires' lines for i18n pkgs that are no longer delivered to |
|
166 |
Nevada (beginning snv_86). |
|
11718 | 167 |
* Tue Feb 26 2008 - [email protected] |
168 |
- Bump to 0.35. This reverts the code change made on 2007-12-07 to |
|
169 |
launch gnome-session with "/bin/sh -c" rather than exec. I |
|
170 |
discovered that using "/bin/sh -c" was having the unwanted |
|
171 |
side-effect of causing gnome-session and child processes to not |
|
172 |
have an associated TTY number. For example, gnome-session should |
|
173 |
have a value like "pts/1", but when using "/bin/sh -c" it has "?". |
|
174 |
So reverting this change fixes this problem. The original need |
|
175 |
to switch to "/bin/sh -c" has gone away now that we launch D-Bus |
|
176 |
from gnome-session instead of from the startup scripts. |
|
177 |
||
11420 | 178 |
* Wed Jan 09 2008 - [email protected] |
179 |
- Bump to 0.34. |
|
11305 | 180 |
* Fri Dec 07 2007 - [email protected] |
181 |
- Bump to 0.33. |
|
10717 | 182 |
* Thu Oct 25 2007 - [email protected] |
183 |
- Add SUNWgnome-dtlogin-integration-01-no-mo.diff. |
|
184 |
We don't need .mo files for this package. |
|
10569 | 185 |
* Fri Sep 28 2007 - [email protected] |
186 |
- combine SUNWgnome-dtlogin-integration and SUNWgnome-dtstart in one |
|
187 |
spec. If this spec file is built without /usr/dt support then |
|
188 |
it builds SUNWgnome-dtstart with include /usr/bin/dtstart and the |
|
189 |
JDS startup scripts in /usr/dt/config. /ust/bin/dtstart is a |
|
190 |
simple replacement for /usr/dt/bin/Xsession |
|
10476 | 191 |
* Fri Sep 07 2007 - [email protected] |
192 |
- Bump to 0.32, remove upstream patch. |
|
10407 | 193 |
* Thu Aug 30 2007 - [email protected] |
194 |
- Add intltoolize call to update intltool scripts. |
|
10207 | 195 |
* Mon Jul 23 2007 - [email protected] |
196 |
- Added SUNWgnome-dtlogin-integration-01-g11n-xinitrc.diff. |
|
197 |
Fixes 6555226, 6583891 |
|
9984 | 198 |
* Tue Jun 5 2007 - [email protected] |
199 |
- bump to 0.31, delete patch |
|
9643 | 200 |
* Mon Apr 02 2007 - [email protected] |
201 |
- Added SUNWgnome-dtlogin-integration-01-unset-locale.diff. Fixes 6532300 |
|
9397 | 202 |
* Tue Nov 14 2006 - [email protected] |
203 |
- Bump to 0.29, to change menu string to 2.16. Fixes 6493544. |
|
204 |
* Thu Aug 24 2006 - [email protected] |
|
205 |
- remove autoheader call since there is AC_CONFIG_HEADER in configure.in |
|
206 |
* Fri Aug 04 2006 - [email protected] |
|
207 |
- Bump to 0.27, to change menu string to 2.15. |
|
208 |
* Fri Jun 23 2006 - [email protected] |
|
209 |
- bump to 0.26, fixes 6340366 "A modified version of |
|
210 |
/usr/dt/config/Xinitrc.jds in /etc/dt/config is not used" and |
|
211 |
moves the code starting ssh-agent here from gdm so that it runs |
|
212 |
for dtlogin users too. |
|
213 |
* Sun Jun 11 2006 - [email protected] |
|
214 |
- change group from other to bin/sys |
|
215 |
* Thu Apr 6 2006 - [email protected] |
|
216 |
- Now use tarball_version |
|
217 |
* Wed Feb 1 2006 - [email protected] |
|
218 |
- Bump to 0.25 to change menu string to "Gnome 2.14 for OpenSolaris" |
|
219 |
* Tue Sep 13 2005 - [email protected] |
|
220 |
- remove unpackaged files |
|
221 |
* Fri Jul 8 2005 - [email protected] |
|
222 |
- Add definition for ACLOCAL_FLAGS in order to build. |
|
223 |
* Fri Apr 1 2005 - [email protected] |
|
224 |
- Update to 0.23. Remove /usr/openwin/bin from PATH and move it to GDM2 |
|
225 |
so it doesn't get set twice when logging in via CDE login. |
|
226 |
* Wed Mar 16 2005 - [email protected] |
|
227 |
- commented out the rm datadir/locale/*/LC_MESSAGES/dtlogin-integration.mo |
|
228 |
line since it got accidently uncommented in my last putback. |
|
229 |
* Tue Mar 01 2005 - [email protected] |
|
230 |
- Update to 0.22: Remove /usr/dt/bin from default user PATH. |
|
231 |
* Wed Dec 15 2004 - [email protected] |
|
232 |
- Update to 0.21: get rid of the login popup |
|
233 |
* Mon Dec 13 2004 - [email protected] |
|
234 |
- Update to 0.20. Implement ARC decision: Remove /usr/demo/jds/bin from PATH |
|
235 |
and change wording for message about adding /usr/sfw/bin to the PATH |
|
236 |
(Xinitrc.in). |
|
237 |
* Fri Nov 26 2004 - [email protected] |
|
238 |
- Added translations for new popup dialog. Asian to be modfied still. |
|
239 |
* Fri Nov 26 2004 - [email protected] |
|
240 |
- update to 0.17: fixes 6182467 (adds sfw login dialog) |
|
241 |
- add %_datadir to files |
|
242 |
* Fri Oct 29 2004 - [email protected] |
|
243 |
- uprev to 0.16: adds comment about /usr/sfw/bin to Xinitrc, uses new |
|
244 |
Solaris 10 branding |
|
245 |
* Wed Oct 20 2004 - [email protected] |
|
246 |
- uprev to 0.15 (removes /usr/sfw/bin from the PATH) |
|
247 |
* Fri Oct 15 2004 - [email protected] |
|
248 |
- Uprevved tarball to 0.14 (0.12 & 0.13 already present) |
|
249 |
* Thu Sep 09 2004 - [email protected] |
|
250 |
- Uprevved tarball to 0.11 |
|
251 |
* Tue Sep 07 2004 - [email protected] |
|
252 |
- Added SourcePackage tag because SUNWgnome-dtlogin-integration-src is too |
|
253 |
long... |
|
254 |
* Tue Sep 07 2004 - [email protected] |
|
255 |
- Added BuildRequires for effective iconv convertions. |
|
256 |
* Tue Sep 07 2004 - [email protected] |
|
257 |
- Uprevved tarball to 0.10 |
|
258 |
* Mon Sep 06 2004 - [email protected] |
|
259 |
- Upstreamed dtlogin-integration-01-g11n-i18n-ui.diff |
|
260 |
* Fri Sep 03 2004 - [email protected] |
|
261 |
- Added dtlogin-integration-01-g11n-i18n-ui.diff |
|
262 |
- Updated BuildRequires |
|
263 |
* Mon Aug 30 2004 - [email protected] |
|
264 |
- Uprevved tarball to 0.9 to fix bugid 5093158 |
|
265 |
* Thu Jul 08 2004 - [email protected] |
|
266 |
- Update to version 0.7 to add /usr/sfw/bin to PATH and /usr/lib/jds-private to |
|
267 |
LD_LIBRARY_PATH. |
|
268 |
* Tue Jun 22 2004 - [email protected] |
|
269 |
- update to version 0.6 to fix th_TH attrib issue (again!) |
|
270 |
* Mon Jun 21 2004 - [email protected] |
|
271 |
- update to version 0.5 |
|
272 |
* Tue Jun 15 2004 - [email protected] |
|
273 |
- update to version 0.4 |
|
274 |
- removed dtlogin-integration-01-th_TH_file_conflict.diff and |
|
275 |
include the same fix to the module. |
|
276 |
* Thu Jun 10 2004 - [email protected] |
|
277 |
- Patch dtlogin-integration-01-th_TH_file_conflict.diff to fix th_TH conflict |
|
278 |
* Tue May 18 2004 - [email protected] |
|
279 |
- update to version 0.3 |
|
280 |
* Tue May 18 2004 - [email protected] |
|
281 |
- update to version 0.2 |
|
282 |
* Tue May 04 2004 - [email protected] |
|
283 |
- initial version of the spec file |