rpms/trustyrc/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 trustyrc.spec, 1.5, 1.6

[Nicoleau Fabien]

Author: eponyme

Update of /cvs/pkgs/rpms/trustyrc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27922

Modified Files:
	.cvsignore sources trustyrc.spec 
Log Message:
Update to 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	19 Apr 2009 01:08:47 -0000	1.4
+++ .cvsignore	16 Aug 2009 17:00:33 -0000	1.5
@@ -1 +1 @@
-trustyrc-0.1.3.tar.gz
+trustyrc-0.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Apr 2009 01:08:47 -0000	1.4
+++ sources	16 Aug 2009 17:00:33 -0000	1.5
@@ -1 +1 @@
-03f9dfd6b15f86b5591086f4194b8fef  trustyrc-0.1.3.tar.gz
+fcbae2faa51301fdaece8741a8f0233f  trustyrc-0.1.4.tar.gz


Index: trustyrc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trustyrc/devel/trustyrc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- trustyrc.spec	27 Jul 2009 06:18:40 -0000	1.5
+++ trustyrc.spec	16 Aug 2009 17:00:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           trustyrc
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.4
+Release:        1%{?dist}
 Summary:        Fully modular IRC robot
 
 Group:          Applications/Internet
@@ -9,7 +9,11 @@ URL:            http://nicoleau.fabien.f
 Source0:        http://nicoleau.fabien.free.fr/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} 
 BuildRequires:  tinyxml-devel, libcurl-devel
+%else if 0%{?rhel}
+BuildRequires:  curl-devel
+%endif
 Obsoletes:      %{name}-plugins <= 0.1.2
 Obsoletes:      %{name}-plugins-extras <= 0.1.2
 Provides:       %{name}-plugins = %{version}-%{release}
@@ -36,15 +40,20 @@ when the plugin is unloaded.
 %build
 CXXFLAGS="${CXXFLAGS:-%optflags}"
 export CXXFLAGS
-make %{?_smp_mflags} PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%if 0%{?fedora}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make %{?_smp_mflags} PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} \
-        LIBDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
-
+%if 0%{?fedora}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=yes
+%else if 0%{?rhel}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} PLUGINSDIR=%{_libdir}/%{name} HAVE_TINYXML=no
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,25 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Sat Aug 16 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.4-1
+- Update to 0.1.4
+- Manage EPEL build
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Fri Mar 27 2009 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.3-1
 - Rebuild for 0.1.3
 - No more sub packages
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
 * Sun Sep 28 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.2-1
 - rebuild for 0.1.2
-
 * Fri Jun 27 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-2
 - Change buildrequires for curl (only on plugins-extras)
 - Licence update
 - non-macro usage for sed
 - english corrections
 - compiler flags set
-
 * Sat Jun 21 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> 0.1.1-1
 - Initital build