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