rpms/ekg2/devel ekg2.spec, 1.12, 1.13 ekg2-pkgconfig.patch, 1.1, NONE ekg2.pc.in, 1.1, NONE

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Wed May 28 21:52:17 UTC 2008


Author: rathann

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2424

Modified Files:
	ekg2.spec 
Removed Files:
	ekg2-pkgconfig.patch ekg2.pc.in 
Log Message:
- don't patch in pkgconfig support, drop ekg2-config instead (consulted
  with upstream)



Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ekg2.spec	28 May 2008 20:46:03 -0000	1.12
+++ ekg2.spec	28 May 2008 21:51:34 -0000	1.13
@@ -9,10 +9,8 @@
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
-Source1:	%{name}.pc.in
 Patch1:		%{name}-rpm.patch
 Patch2:		%{name}-gcc43.patch
-Patch3:		%{name}-pkgconfig.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
 BuildRequires:	automake17
@@ -197,10 +195,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-rc1
-cp -p %{SOURCE1} ekg/
 %patch1 -p1 -b .r
 %patch2 -p1 -b .gcc43
-%patch3 -p1 -b .p
 cp -p README README-main
 # convert docs to UTF-8
 for file in \
@@ -252,6 +248,7 @@
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
 
 rm $RPM_BUILD_ROOT%{_datadir}/ekg2/plugins/jabber/jabber_handlers*.c
+rm $RPM_BUILD_ROOT%{_bindir}/ekg2-config
 
 %find_lang %{name}
 
@@ -301,7 +298,6 @@
 %files devel
 %defattr(644,root,root,755)
 %doc docs/TODO
-%{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}
 
 %files gadu-gadu
@@ -361,7 +357,7 @@
 %changelog
 * Wed May 28 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.1.rc1
 - updated to 0.2-rc1 (#435369)
-- fix multiarch conflicts (#341051)
+- fixed multiarch conflicts (#341051)
 - updated gcc43 patch
 - fixed compilation against the new glibc
 


--- ekg2-pkgconfig.patch DELETED ---


--- ekg2.pc.in DELETED ---




More information about the scm-commits mailing list