rpms/pisg/EL-4 pisg-0.72-systemdirs.patch, NONE, 1.1 pisg.spec, NONE, 1.1 sources, 1.1, 1.2

Sindre Pedersen Bjørdal (sindrepb) fedora-extras-commits at redhat.com
Tue Aug 12 08:13:27 UTC 2008


Author: sindrepb

Update of /cvs/pkgs/rpms/pisg/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29730

Modified Files:
	sources 
Added Files:
	pisg-0.72-systemdirs.patch pisg.spec 
Log Message:
add files to branch

pisg-0.72-systemdirs.patch:

--- NEW FILE pisg-0.72-systemdirs.patch ---
diff -up pisg-0.72/pisg.orig pisg-0.72/pisg
--- pisg-0.72/pisg.orig	2008-08-08 02:18:01.000000000 +0200
+++ pisg-0.72/pisg	2008-08-08 02:49:52.000000000 +0200
@@ -29,11 +29,14 @@ sub main
     # If the script was executed as ./pisg - then we just remove
     # everything after the last slash, if it was executed as 'perl pisg'
     # we assume that we are executing in the current dir.
-    if ($script_dir =~ m/\/[^\/]*$/) {
-        $script_dir =~ s/\/[^\/]*$//;
-    } else {
-        $script_dir = ".";
-    }
+#    if ($script_dir =~ m/\/[^\/]*$/) {
+#        $script_dir =~ s/\/[^\/]*$//;
+#    } else {
+#        $script_dir = ".";
+#    }
+
+#for Fedora, use shared datadir
+    $script_dir = "/usr/share/pisg/";
 
     if (!-t STDOUT) { # we are not writing to a terminal
 	push @ARGV, "--silent";
@@ -79,6 +82,8 @@ sub get_cmdline_options
         modules_dir => "$script_dir/modules/",     # Module search path
         logfile => [],
         logdir => [],
+#for Fedora, used system dirs
+	    configfile => "/etc/pisg.cfg"
     );
 
     # Commandline options


--- NEW FILE pisg.spec ---
Name:           pisg
Version:        0.72
Release:        3%{?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       
#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))



%description
Pisg is an IRC statistics generator. It takes IRC logfiles and turns
them into nice looking stats.

%prep
%setup -q
%patch0 -p1

#permissions
chmod 0644 scripts/pum/pum.pl

%build
#no build

%install
rm -rf $RPM_BUILD_ROOT
#manual installation of all needed files
install -p -D -m 0755 pisg $RPM_BUILD_ROOT/usr/bin/pisg
install -p -D -m 0644 pisg.cfg $RPM_BUILD_ROOT/etc/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


%files
%defattr(-,root,root,-)
%doc COPYING README docs/Changelog docs/CREDITS docs/pisg-doc.txt
%doc scripts
%{_bindir}/*
%{_datadir}/pisg
%{_mandir}/man?/*
%{perl_vendorlib}/*
%config(noreplace)%{_sysconfdir}/*

%changelog
* Fri Aug 08 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.72-3
- Initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pisg/EL-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Aug 2008 17:32:36 -0000	1.1
+++ sources	12 Aug 2008 08:12:56 -0000	1.2
@@ -0,0 +1 @@
+28ffff94b052ff8ba7621d7d8394b296  pisg-0.72.tar.gz




More information about the fedora-extras-commits mailing list