rpms/gkrellm-weather/devel gkrellm-weather.spec,1.4,1.5
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue Nov 23 23:16:23 UTC 2004
Changeset from: scop
Update of /cvs/extras/rpms/gkrellm-weather/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv7048
Modified Files:
gkrellm-weather.spec
Log Message:
Test commit: clean up specfile and convert to UTF-8.
Index: gkrellm-weather.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-weather/devel/gkrellm-weather.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gkrellm-weather.spec 8 Nov 2004 04:24:48 -0000 1.4
+++ gkrellm-weather.spec 23 Nov 2004 23:16:21 -0000 1.5
@@ -4,20 +4,20 @@
Summary: GKrellWeather is a weather plugin for GKrellM
Name: gkrellm-weather
Version: 2.0.6
-Release: 0.fdr.1.2
+Release: 2
Epoch: 0
License: GPL
Group: Applications/System
URL: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
Source0: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/gkrellweather-2.0.6.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
BuildRequires: perl, gtk2-devel, gkrellm-devel >= 0:2, gettext
Requires: gkrellm >= 0:2
%description
%{summary}.
-# -----------------------------------------------------------------------------
%prep
%setup -q -n gkrellweather-%{version}
@@ -26,33 +26,29 @@
s|PREFIX "/bin/GrabWeather|"%{datadir}/GrabWeather| ' \
gkrellweather.c
perl -pi -e \
- 's|^(CFLAGS\s*=.+)$|$1 %{optflags}|' \
+ "s|^(CFLAGS\\s*=.+)\$|\$1 $RPM_OPT_FLAGS|" \
Makefile
-# -----------------------------------------------------------------------------
%build
-CFLAGS="%{optflags}" make %{?_smp_mflags} enable_nls=1
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} enable_nls=1
-# -----------------------------------------------------------------------------
%install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-mkdir -p %{buildroot}{%{datadir},%{plugdir}}
-cp -p *.so %{buildroot}%{plugdir}
-cp -p GrabWeather %{buildroot}%{datadir}
+mkdir -p $RPM_BUILD_ROOT{%{datadir},%{plugdir}}
+cp -p *.so $RPM_BUILD_ROOT%{plugdir}
+cp -p GrabWeather $RPM_BUILD_ROOT%{datadir}
-%makeinstall \
- INSTALL_PREFIX=%{buildroot} LOCALEDIR=%{_datadir}/locale -C po enable_nls=1
+make install INSTALL_PREFIX=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale \
+ -C po enable_nls=1
%find_lang gkrellweather
-# -----------------------------------------------------------------------------
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-# -----------------------------------------------------------------------------
%files -f gkrellweather.lang
%defattr(0644,root,root,0755)
@@ -60,8 +56,10 @@
%attr(0755,root,root) %{datadir}/*
%attr(0755,root,root) %{plugdir}/*
-# -----------------------------------------------------------------------------
%changelog
-* Sun Apr 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0.6-0.fdr.1
+* Fri Nov 19 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0.6-2
+- Clean up specfile and convert to UTF-8.
+
+* Sun Apr 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0.6-0.fdr.1
- First Fedora release.
More information about the scm-commits
mailing list