RH8 spec for 20050830

[Vincent Béron]

Le lun 26/09/2005 à 14:59, Michael Ost a écrit :
> Can someone who understands wine build issues review this RPM spec file
> for me, please? 

Attached is the spec file I'm using for 20050830 on RH8 (not finished
building on all other distributions yet).

> The RPMs for Redhat 8 are getting pretty long in the tooth on the Wine
> downloads page... dating back to May 24. I wanted to build a source RPM
> to work with, so I modified the 20050524 spec file for 20050830.

I know, that's my fault (and real life's fault in general).

> It seems that there are changes in fonts and documentation. I removed
> some lines that were keeping rpmbuild from working. But I feel like I am
> tampering with issues beyond my grasp. Do the attached changes to the
> spec file look ok (temporarily marked with "todo")? Any gotchas?
> Anything missing?

--sysconfdir is not needed anymore by configure (harmless if present).
dlls/wineps had a installable file not installed by default (fixed since
then). See the diff for the rest of it, but your changes pretty much
covered it.

The fonts part is because not everyone has fontforge installed, so I
prefer to provide already built fonts. Not sure what was your problem
with the fonts.

Vincent
-------------- next part --------------
--- wine-20050524-1rh8winehq.spec	2005-05-30 22:48:05.000000000 -0400
+++ wine-20050830-1rh8winehq.spec	2005-09-21 21:59:07.000000000 -0400
@@ -1,4 +1,4 @@
-%define DATE 20050524
+%define DATE 20050830
 Summary: A Windows 16/32 bit emulator.
 Name: wine
 Version: %{DATE}
@@ -42,8 +42,7 @@
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-%configure \
-	--sysconfdir=%{_sysconfdir}/wine
+%configure
 
 %{__make} depend
 %{__make}
@@ -53,21 +52,10 @@
 
 %makeinstall \
 	includedir=%{?buildroot:%{buildroot}}%{_includedir}/wine \
-	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir}/wine \
-	dlldir=%{?buildroot:%{buildroot}}%{_libdir}/wine \
-	LDCONFIG=/bin/true \
-	UPDATE_DESKTOP_DATABASE=/bin/true
-%makeinstall \
-	-C dlls/wineps \
-	includedir=%{?buildroot:%{buildroot}}%{_includedir}/wine \
-	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir}/wine \
 	dlldir=%{?buildroot:%{buildroot}}%{_libdir}/wine \
 	LDCONFIG=/bin/true \
 	UPDATE_DESKTOP_DATABASE=/bin/true
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/wine
-install -c -m 0644 documentation/samples/config $RPM_BUILD_ROOT%{_sysconfdir}/wine/config
-
 cat >RedHat <<EOF
 Wine directory structure used in Red Hat Linux:
 ===============================================
@@ -154,7 +142,6 @@
 %{_libdir}/wine/*.so
 %{_mandir}/man1/wine.1*
 %{_mandir}/man1/winedbg.1*
-%{_mandir}/man5/wine.conf.5*
 %{_datadir}/aclocal/wine.m4
 %{_datadir}/applications/wine.desktop
 %attr(0755, root, root) %dir %{_datadir}/fonts/wine
@@ -163,12 +150,10 @@
 %attr(0755, root, root) %dir %{_datadir}/wine
 %{_datadir}/wine/generic.ppd
 %{_datadir}/wine/wine.inf
-%config %{_sysconfdir}/wine
 %config %{_initrddir}/wine
 %doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD README VERSION
 %doc AUTHORS RedHat
 %doc documentation/ChangeLog.OLD documentation/README.de documentation/README.es documentation/README.fr documentation/README.it documentation/README.pt documentation/README.pt_br
-%doc documentation/samples
 
 %files devel
 %defattr(-,root,root)
@@ -196,6 +181,16 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Sep 21 2005 Vincent Béron <vberon at mecano.gme.usherb.ca> 20050830-1rh8
+- Update to 20050830
+
+* Wed Sep 21 2005 Vincent Béron <vberon at mecano.gme.usherb.ca> 20050725-1rh8
+- Update to 20050725
+
+* Tue Jun 28 2005 Vincent Béron <vberon at mecano.gme.usherb.ca> 20050628-1rh8
+- Update to 20050628
+- Config file now deprecated, use winecfg and/or regedit
+
 * Mon May 30 2005 Vincent Béron <vberon at mecano.gme.usherb.ca> 20050524-1rh8
 - Update to 20050524
 - Remove pdf documentation build as it's no more included in the main archive