rpms/twinkle/devel twinkle.spec,1.21,1.22

Kevin Fenzi kevin at fedoraproject.org
Thu Apr 2 06:57:21 UTC 2009


Author: kevin

Update of /cvs/extras/rpms/twinkle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17250

Modified Files:
	twinkle.spec 
Log Message:
adapt for EL-5



Index: twinkle.spec
===================================================================
RCS file: /cvs/extras/rpms/twinkle/devel/twinkle.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- twinkle.spec	26 Feb 2009 03:05:14 -0000	1.21
+++ twinkle.spec	2 Apr 2009 06:56:51 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           twinkle
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A SIP Soft Phone
 
 Group:          Applications/Internet
@@ -17,11 +17,18 @@
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
 BuildRequires: alsa-lib-devel
-BuildRequires: kdelibs3-devel
 BuildRequires: bison
 BuildRequires: libzrtpcpp-devel
-BuildRequires: file-devel
 BuildRequires: readline-devel
+%if 0%{?fedora}
+BuildRequires: file-devel
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: file
+BuildRequires: ncurses-devel
+BuildRequires: bind-libbind-devel
+BuildRequires: kdelibs-devel
+%endif
 
 %description
 Twinkle is a SIP based soft phone for making telephone calls over IP networks.
@@ -43,7 +50,12 @@
 install -m 644 src/gui/images/twinkle48.png %{buildroot}%{_datadir}/pixmaps/twinkle.png
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/twinkle.desktop
-desktop-file-install --vendor fedora                            \
+desktop-file-install                            \
+%if 0%{?fedora}
+         --vendor fedora                        \
+%else
+         --vendor ""                            \
+%endif
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
         twinkle.desktop
@@ -58,9 +70,16 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/twinkle.png
+%if 0%{?fedora}
 %{_datadir}/applications/fedora-twinkle.desktop
+%else
+%{_datadir}/applications/twinkle.desktop
+%endif
 
 %changelog
+* Wed Feb 25 2009 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 1.4.2-2
+- adapt for EL-5
+
 * Wed Feb 25 2009 Kevin Fenzi <kevin at tummy.com> - 1.4.2-1
 - Update to 1.4.2
 




More information about the fedora-extras-commits mailing list