rpms/pidgin/F-10 pidgin.spec,1.65,1.66
Warren Togami 砥上勇
wtogami at fedoraproject.org
Sun Nov 23 05:34:27 UTC 2008
- Previous message: rpms/snmp++/F-9 import.log, NONE, 1.1 snmp++.spec, NONE, 1.1 snmp-build.patch, NONE, 1.1 snmp-settings.patch, NONE, 1.1 snmp-warnings.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/gnome-disk-utility/devel gnome-disk-utility.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wtogami
Update of /cvs/pkgs/rpms/pidgin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10869
Modified Files:
pidgin.spec
Log Message:
more stuff to make the build work on RHEL4
Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-10/pidgin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- pidgin.spec 22 Nov 2008 21:31:49 -0000 1.65
+++ pidgin.spec 23 Nov 2008 05:33:57 -0000 1.66
@@ -8,9 +8,11 @@
# Map RHEL to Fedora version
%if 0%{?rhel} == 4
%define fedora 3
+%define dist .el4
%endif
%if 0%{?rhel} == 5
%define fedora 6
+%define dist .el5
%endif
# Define variables to use in conditionals
@@ -176,7 +178,7 @@
%if %{bonjour_support}
BuildRequires: avahi-glib-devel
%endif
-# Meanwhile integration (F7+)
+# Meanwhile integration (F6+)
%if %{meanwhile_integration}
BuildRequires: meanwhile-devel
%endif
@@ -379,6 +381,9 @@
%else
SWITCHES="$SWITCHES --disable-gstreamer"
%endif
+%if ! %{meanwhile_integration}
+ SWITCHES="$SWITCHES --disable-meanwhile"
+%endif
# FC5+ automatic -fstack-protector-all switch
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
- Previous message: rpms/snmp++/F-9 import.log, NONE, 1.1 snmp++.spec, NONE, 1.1 snmp-build.patch, NONE, 1.1 snmp-settings.patch, NONE, 1.1 snmp-warnings.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/gnome-disk-utility/devel gnome-disk-utility.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list