rpms/incollector/F-11 incollector.spec,1.5,1.6

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/incollector/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9104

Modified Files:
	incollector.spec 
Log Message:
* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
- Changed the license to GPLv2
- Added pixmaps-install.patch

* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
- Changed sed to patch
- Removed pushd command



Index: incollector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/incollector/F-11/incollector.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- incollector.spec	15 Nov 2009 07:40:50 -0000	1.5
+++ incollector.spec	8 Dec 2009 10:34:20 -0000	1.6
@@ -3,14 +3,16 @@
 
 Name:           incollector
 Version:        1.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Information collector
 Group:          Applications/Productivity
-License:        GPLv2+
+License:        GPLv2
 URL:            http://www.incollector.devnull.pl/
 Source0:        http://www.incollector.devnull.pl/download/sources/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         %{name}-mono.patch
+Patch1:		%{name}-fixlib.patch
+Patch2:		%{name}-%{version}-pixmaps-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk-sharp2-devel gettext desktop-file-utils
 
@@ -25,9 +27,9 @@ search for entries by specified criteria
 %prep
 %setup -q
 %patch0
+%patch1
+%patch2
 chmod a-x README AUTHORS
-pushd po
-popd
 
 %build
 %configure
@@ -35,7 +37,6 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-sed -i 's|/usr/lib|%{_libdir}|' %{name}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 %find_lang %{name}
 rm %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -54,10 +55,17 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.ico
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-3
+- Changed the license to GPLv2
+- Added pixmaps-install.patch
+
+* Thu Dec 03 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-2
+- Changed sed to patch
+- Removed pushd command
+
 * Sun Nov 15 2009 Thomas Janssen <thomasj at fedoraproject.org> 1.2-1
 - Updated to new upstream version 1.2