[pisg] 0.73 bump, spec cleanup

Petr Šabata psabata at fedoraproject.org
Thu Jan 26 11:22:10 UTC 2012


commit ad4e5b720d48559206aec4675e54f28c3bc1efaa
Author: Petr Šabata <contyk at redhat.com>
Date:   Thu Jan 26 12:18:50 2012 +0100

    0.73 bump, spec cleanup

 .gitignore |    1 +
 pisg.spec  |   62 +++++++++++++++++++++++++++--------------------------------
 sources    |    2 +-
 3 files changed, 30 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ca1e25..9914d6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pisg-0.72.tar.gz
+/pisg-0.73.tar.gz
diff --git a/pisg.spec b/pisg.spec
index e37ca9f..ff84c78 100644
--- a/pisg.spec
+++ b/pisg.spec
@@ -1,23 +1,19 @@
 Name:           pisg
-Version:        0.72
-Release:        12%{?dist}
+Version:        0.73
+Release:        1%{?dist}
 Summary:        IRC Statistics generator
-
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://pisg.sourceforge.net/
-Source0:        http://prdownloads.sourceforge.net/pisg/%{name}-%{version}.tar.gz       
+Source0:        http://prdownloads.sourceforge.net/pisg/%{name}-%{version}.tar.gz
 #use system dirs
 Patch0:         pisg-0.72-systemdirs.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#no build needed
 BuildArch:      noarch
-
-#BuildRequires:  
 Requires:       perl(Text::Iconv)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 Pisg is an IRC statistics generator. It takes IRC log-files and turns
 them into nice looking stats.
@@ -25,35 +21,29 @@ them into nice looking stats.
 %prep
 %setup -q
 %patch0 -p1
-
-#permissions
-chmod 0644 scripts/pum/pum.pl
-
-%build
-#no build
+for file in COPYING \
+            README \
+            $(find docs -type f) \
+            $(find scripts -type f) \
+            $(find modules -type f) \
+            $(find gfx -type f) \
+            $(find layout -type f)
+do
+    chmod 644 ${file}
+done
+sed -i 's/\r//' scripts/mirc2egg.sed
 
 %install
-rm -rf $RPM_BUILD_ROOT
-#manual installation of all needed files
-install -p -D -m 0755 pisg $RPM_BUILD_ROOT%{_bindir}/pisg
-install -p -D -m 0644 pisg.cfg $RPM_BUILD_ROOT%{_sysconfdir}/pisg.cfg
-
-install -p -D -m 0644 lang.txt $RPM_BUILD_ROOT%{_datadir}/pisg/lang.txt
-cp -rp gfx $RPM_BUILD_ROOT%{_datadir}/pisg/gfx
-cp -rp layout $RPM_BUILD_ROOT%{_datadir}/pisg/layout
-
-#modules into perl dir
-install -p -D -m 0644 modules/Pisg.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Pisg.pm
-cp -rp modules/Pisg $RPM_BUILD_ROOT%{perl_vendorlib}/Pisg
-
-#man file into mandir
-install -p -D -m 0644 docs/pisg.1 $RPM_BUILD_ROOT%{_mandir}/man1/pisg.1
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+install -p -D -m755 pisg %{buildroot}%{_bindir}/pisg
+install -p -D -m644 pisg.cfg %{buildroot}%{_sysconfdir}/pisg.cfg
+install -p -D -m644 lang.txt %{buildroot}%{_datadir}/pisg/lang.txt
+cp -rp gfx %{buildroot}%{_datadir}/pisg/gfx
+cp -rp layout %{buildroot}%{_datadir}/pisg/layout
+install -p -D -m644 modules/Pisg.pm %{buildroot}%{perl_vendorlib}/Pisg.pm
+cp -rp modules/Pisg %{buildroot}%{perl_vendorlib}/Pisg
+install -p -D -m644 docs/pisg.1 %{buildroot}%{_mandir}/man1/pisg.1
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README docs/Changelog docs/CREDITS docs/pisg-doc.txt
 %doc scripts
 %{_bindir}/%{name}
@@ -63,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace)%{_sysconfdir}/%{name}.cfg
 
 %changelog
+* Thu Jan 26 2012 Petr Šabata <contyk at redhat.com> - 0.73-1
+- 0.73 bump
+- Spec cleanup
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 6adeba9..9e7bdab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28ffff94b052ff8ba7621d7d8394b296  pisg-0.72.tar.gz
+e0d43082c0bc20e19978743ebf2fcf8b  pisg-0.73.tar.gz


More information about the scm-commits mailing list