source: projects/specs/trunk/x/xorg-x11-xinit/xorg-x11-xinit-vl.spec @ 12005

Revision 12005, 11.6 KB checked in by tomop, 5 years ago (diff)

Merge branch 'tomop'

Line 
1%define pkgname xinit
2
3Summary:     X.Org X11 X Window System xinit startup scripts
4Summary(ja): X.Org X11 X ウィンドウシステム xinit スタートアップスクリプト
5Name:      xorg-x11-%{pkgname}
6Version:   1.3.4
7Release:   3%{?_dist_release}
8License:   MIT/X11
9Group:     User Interface/X
10URL:       http://www.x.org
11
12Source0:  ftp://ftp.x.org/pub/individual/app/%{pkgname}-%{version}.tar.bz2
13Source10: xinitrc-common
14Source11: xinitrc
15Source12: Xclients
16Source13: Xmodmap
17Source14: Xresources
18# NOTE: Xsession is used by xdm/kdm/gdm and possibly others, so we keep it
19#       here instead of the xdm package.
20Source16: Xsession
21Source17: localuser.sh
22Source18: xinit-compat.desktop
23
24Patch1: xinit-1.3.4-client-session.patch
25Patch3: xinit-1.0.9-unset.patch
26
27Patch10: xinit-1.3.4-vine.patch
28
29BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
30BuildRequires: pkgconfig
31BuildRequires: libX11-devel
32BuildRequires: autoconf
33BuildRequires: automake
34BuildRequires: libtool
35BuildRequires: dbus-devel
36BuildRequires: xorg-x11-util-macros
37# NOTE: startx needs xauth in order to run, but that is not picked up
38#       automatically by rpm.  (Bug #173684)
39Requires: xauth
40# next two are for localuser.sh
41Requires: coreutils
42Requires: xorg-x11-server-utils
43Requires: dbus-x11
44
45# NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
46# modularization.  These Obsoletes lines ensure upgrades work smoothly.
47Obsoletes: XFree86, XOrg
48
49# NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit,
50# so the xinitrc package became unnecessary.  The xdm configs/scripts move
51# to the xdm package.
52Obsoletes: xinitrc
53Provides: xinitrc
54
55Vendor: Project Vine
56Distribution: Vine Linux
57
58%description
59X.Org X11 X Window System xinit startup scripts
60
61%description -l ja
62X.Org X11 X Window System の xinit スタートアップ・スクリプト
63
64%package session
65Summary: Display manager support for ~/.xsession and ~/.Xclients
66Group: User Interface/X
67
68%description session
69Allows legacy ~/.xsession and ~/.Xclients files to be used from display managers
70
71%prep
72%setup -q -n %{pkgname}-%{version}
73%patch1 -p1 -b .client-session
74%patch3 -p1 -b .unset
75%patch10 -p1 -b .vine
76
77%build
78autoreconf -i
79%configure
80# FIXME: Upstream should default to XINITDIR being this.  Make a patch to
81# Makefile.am and submit it in a bug report or check into CVS.
82make XINITDIR=/etc/X11/xinit
83
84%install
85rm -rf $RPM_BUILD_ROOT
86# FIXME: Upstream should default to XINITDIR being this.  Make a patch to
87# Makefile.am and submit it in a bug report or check into CVS.
88%makeinstall XINITDIR=$RPM_BUILD_ROOT/etc/X11/xinit
89install -m644 -D $RPM_SOURCE_DIR/xinit-compat.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compat.desktop
90
91# Install custom xinitrc, etc.
92{
93    install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc-common
94
95    for script in %{SOURCE11} %{SOURCE12} %{SOURCE16} ; do
96        install -m 755 $script $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/${script##*/}
97    done
98
99    install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/X11/Xmodmap
100    install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/X11/Xresources
101
102    mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
103    install -m 755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/localuser.sh
104
105    mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/Xclients.d
106}
107
108%clean
109rm -rf $RPM_BUILD_ROOT
110
111%files
112%defattr(-,root,root,-)
113%license COPYING
114%doc README ChangeLog
115%{_bindir}/startx
116%{_bindir}/xinit
117%dir %{_sysconfdir}/X11
118%dir %{_sysconfdir}/X11/xinit
119%{_sysconfdir}/X11/xinit/xinitrc
120%{_sysconfdir}/X11/xinit/xinitrc-common
121%config(noreplace) %{_sysconfdir}/X11/Xmodmap
122%config(noreplace) %{_sysconfdir}/X11/Xresources
123%dir %{_sysconfdir}/X11/xinit/Xclients.d
124%{_sysconfdir}/X11/xinit/Xclients
125%{_sysconfdir}/X11/xinit/Xsession
126%dir %{_sysconfdir}/X11/xinit/xinitrc.d
127%{_sysconfdir}/X11/xinit/xinitrc.d/*
128#%dir %{_mandir}/man1
129%{_mandir}/man1/startx.1*
130%{_mandir}/man1/xinit.1*
131
132%files session
133%defattr(-, root, root)
134%{_datadir}/xsessions/xinit-compat.desktop
135
136%changelog
137* Sat Jan 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.4-3
138- dropped ConsoleKit stuff.
139
140* Sat Apr  8 2017 IWAI, Masaharu <iwaim.sub@gmail.com> 1.3.4-2
141- update Source12: [BTS:0003071]
142 - add MATE
143
144* Sat Nov 22 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.4-1
145- new upstream release
146- update Patch1 (xinit-1.3.4-client-session.patch)
147- update Patch10 (xinit-1.3.4-vine.patch)
148
149* Wed Jun 04 2014 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.3.3-2
150- exec startfluxbox instead of fluxbox
151
152* Thu Dec 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.3-1
153- new upstream release
154
155* Sun Jan 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.2-1
156- new upstream release
157
158* Sun Aug 14 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.1-1
159- new upstream release
160
161* Sun Nov 07 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.0-1
162- new upstream release
163- update Patch1, Patch10
164
165* Fri Mar 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.1-1
166- new upstream release
167- updated SOURCE12, SOURCE100
168- Install xinitrc-common non-executable.
169- added a new subpackage to add ~/.xsessions and ~/.Xclients
170  to session list
171
172* Thu Nov 19 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0-1
173- new upstream release
174
175* Sun Jul 26 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1.1-3
176- add Requires: dbus-x11
177
178* Mon Mar 23 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1.1-2
179- add LXDE to Xclients
180
181* Sun Dec 21 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1.1-1
182- new upstream release
183
184* Wed Oct 22 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1.0-2
185- fix typo in Xsession (<BTS:644>)
186
187* Sat Jul 05 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.1.0-1
188- new upstream release
189
190* Fri Jun 27 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.7-3
191- spec in UTF-8
192- modify Source16: add CK_XINIT_SESSION calls
193
194* Fri May 09 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.7-2
195- add Patch10 to set display resolution.
196
197* Thu May 08 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.7-1
198- initial build for Vine Linux
199
200* Fri Oct 12 2007 Nalin Dahyabhai <nalin@redhat.com> 1.0.7-2
201- Try opening the console-kit session after the user's UID has already
202  been granted access to the server by localuser.sh, so that console-kit-daemon
203  can connect and ask the server for information just by having switch to the
204  user's UID (#287941).
205
206* Mon Sep 24 2007 Adam Jackson <ajax@redhat.com> 1.0.7-1
207- xinit 1.0.7
208
209* Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 1.0.2-27
210- Rebuild for build id
211
212* Mon Aug 6 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-26
213- Bump release
214
215* Mon Aug 6 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-25
216- Fix typo: s/unask/umask/ - Bug 250882, Jan ONDREJ (ondrejj@salstar.sk)
217
218* Thu Aug 2 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-24
219- Fix bug 212167, CVE-2006-5214
220
221* Sun Jul 29 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-23
222- Fix Xsession to run the login shell inside the setgid ssh-agent, rather
223  than the other way around. This preserves LD_LIBRARY_PRELOAD.
224        Patch from Stefan Becker, bug 164869.
225
226* Fri Jul 27 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-22
227- Remove xinput.sh. Bug 244963.
228
229* Mon May 21 2007 Adam Jackson <ajax@redhat.com> 1.0.2-21
230- localuser.sh: Run silently.
231
232* Sun Apr 22 2007 Matthias Clasen <mclasen@redhat.com> 1.0.2-20
233- Don't install INSTALL
234
235* Thu Apr 19 2007 Warren Togami <wtogami@redhat.com> 1.0.2-19
236- disable SCIM by default in non-Asian languages #237054
237  If you want to use SCIM, use im-chooser to enable it.
238
239* Mon Apr 02 2007 David Zeuthen <davidz@redhat.com> 1.0.2-18
240- Man pages are now in section 1, not in section 1x
241
242* Mon Apr 02 2007 David Zeuthen <davidz@redhat.com> 1.0.2-17
243- Also BR xorg-x11-util-macros since we autoreconf
244
245* Mon Apr 02 2007 David Zeuthen <davidz@redhat.com> 1.0.2-16
246- Add ConsoleKit support (#233183)
247
248* Mon Nov 27 2006 Adam Jackson <ajax@redhat.com> 1.0.2-15
249- Bump EVR to fix 6 to 7 updates.
250
251* Fri Nov 10 2006 Ray Strode <rstrode@redhat.com> - 1.0.2-14
252- start client in its own session with no controlling tty
253  (bug 214649)
254
255* Mon Oct 23 2006 Kristian H淡gsberg <krh@redhat.com> - 1.0.2-13
256- Update Xsession to not use switchdesk for the hard coded kde and twm
257  cases.
258
259* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-12
260- rebuilt for unwind info generation, broken in gcc-4.1.1-21
261
262* Mon Sep 25 2006 Kristian H淡gsberg <krh@redhat.com> - 1.0.2-11.fc6
263- Bump and rebuild.
264
265* Mon Sep 25 2006 Kristian H淡gsberg <krh@redhat.com> - 1.0.2-10.fc6
266- Move hardcoded xsetroot background color to fallback cases (#205901).
267
268* Thu Aug 17 2006 Kristian H淡gsberg <krh@redhat.com> - 1.0.2-9.fc6
269- Start ssh-agent for startx also (#169259).
270
271* Sat Jul 22 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-8.fc6
272- Fix SourceN line for localuser.sh to not collide.
273
274* Fri Jul 21 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-7.fc6
275- Added localuser.sh.
276
277* Wed Jul 19 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-6.fc6
278- Added fix to Xclients script, based on patch from bug (#190799)
279
280* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> 1.0.2-5.1.fc6
281- rebuild
282
283* Wed Jul 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-5.fc6
284- Implemented changes to xinput.sh based on suggestions from (#194458)
285
286* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-4
287- Added documentation to doc macro.
288
289* Tue Jun 20 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-3
290- Added xinit-1.0.2-setuid.diff to fix potential security issue (#196094)
291
292* Tue Jun 06 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-2
293- Added "BuildRequires: pkgconfig" for bug (#194187)
294
295* Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-1
296- Update xinit to 1.0.2
297
298* Thu Feb 16 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
299- Change Conflicts to Obsoletes for xorg-x11 and XFree86 (#181414)
300
301* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.2
302- bump again for double-long bug on ppc(64)
303
304* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-1.1
305- rebuilt for new gcc4.1 snapshot and glibc changes
306
307* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1
308- Updated to xinit 1.0.1 from X11R7.0
309
310* Fri Dec 16 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
311- Updated to xinit 1.0.0 from X11R7 RC4.
312- Changed manpage dir from man1x to man1 to match upstream default.
313
314* Tue Nov 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-6
315- Add "Requires: xauth" for startx, to fix bug (#173684)
316
317* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 0.99.3-5
318- Do not provide xinit anymore, gdm has been fixed and that breaks things
319  with the obsoletes
320
321* Sat Nov 12 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-4
322- Added Xsession script from xinitrc, as it is very similar codebase, which
323  shares "xinitrc-common" anyway, and all of the display managers use it.
324
325* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-3
326- Updated to xinit 0.99.3 from X11R7 RC2.
327
328* Mon Nov 07 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
329- Added "Provides: xinitrc = 5.0.0-1" for temporary compatibility between
330  monolithic and modular X.  This will be removed however for FC5.
331
332* Mon Oct 31 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
333- Import custom Red Hat xinit scripts from xinitrc package.
334- Obsolete xinitrc package, as we include the scripts/configs here now.
335- Fix all scripts/configs to avoid the now obsolete /usr/X11R6 prefix.
336
337* Mon Oct 31 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
338- Updated to xinit 0.99.2 from X11R7 RC1.
339- Change manpage location to 'man1x' in file manifest.
340
341* Wed Oct 05 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
342- Use Fedora-Extras style BuildRoot tag.
343- Update BuildRequires to use new library package names.
344- Tidy up spec file a bit.
345
346* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1
347- Initial build.
Note: See TracBrowser for help on using the repository browser.