X-Git-Url: http://git.pld-linux.org/?p=packages%2FLinPopUp.git;a=blobdiff_plain;f=LinPopUp.spec;h=6b0b1d892bdb6be3fcbf675bb74784a8bbb19467;hp=eb236ea82eca6a1e15227ff64ee1ef56c68ea6f1;hb=dc2b8b29be997cb3e8055c79e4d0a1c8ab8559c7;hpb=7246a6c223549f8a46c702237abfcde9b05b060a

diff --git a/LinPopUp.spec b/LinPopUp.spec
index eb236ea..6b0b1d8 100644
--- a/LinPopUp.spec
+++ b/LinPopUp.spec
@@ -1,47 +1,49 @@
+# TODO:
+# - evil permissions on /var/lib/linpopup/messages.dat
+# - nobody user MUST NOT own anything
 Summary:	Linux enhanced port of winpopup
-Summary(pl):	Port winpopup'a pod Linux'a
+Summary(pl):	Port programu winpopup pod Linuksa
 Name:		LinPopUp
 Version:	1.2.0
-Release:	3
+Release:	7
 License:	GPL
 Group:		X11/Applications/Networking
-Group(de):	X11/Applikationen/Netzwerkwesen
-Group(pl):	X11/Aplikacje/Sieciowe
-Source0:	ftp://littleigloo.org/pub/linpopup/%{name}-%{version}.src.tar.gz
+Source0:	http://www.chez.com/littleigloo/files/%{name}-%{version}.src.tar.gz
+# Source0-md5:	26503ac44971e334cbbb0a79dd796d93
+Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		%{name}-prefix.patch
-URL:		http://www.littleigloo.org/
-Icon:		LinPopUp.gif
+URL:		http://www.littleigloo.org/software_002.php3
 BuildRequires:	gtk+-devel
 Requires:	samba
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
-
 %description
 LinPopUp is a Xwindow graphical port of Winpopup, running over Samba.
-It permits to communicate with a windows computer that runs Winpopup,
+It permits to communicate with a Windows computer that runs Winpopup,
 sending or receiving message. (It also provides an alternative way to
 communicate between Linux computers that run Samba). Please note that
 LinPopUp is not only a port, as it includes several enhanced features.
 Also note that it requires to have Samba installed to be fully
-functionnal.
+functional.
 
 %description -l pl
-LinPopUp umo¿liwia wysy³anie krótkich kominikatów tekstowych przy
-wykorzystaniu Samby. Pozwala na komunikacjê z osobami pos³uguj±cymi
-siê Winpopup'em.
+LinPopUp umo¿liwia wysy³anie krótkich komunikatów tekstowych przy
+wykorzystaniu Samby spod X Window. Pozwala na komunikacjê z osobami
+pos³uguj±cymi siê Winpopupem pod Windows. (Jest tak¿e alternatywnym
+sposobem na komunikacjê miêdzy u¿ytkownikami Linuksa z Samb±.)
+LinPopUp nie jest tylko portem - zawiera te¿ parê rozszerzeñ.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 cd src
 %{__make} \
 	DESTDIR="" \
 	PREFIX="%{_prefix}" \
-	DOC_DIR="%{_defaultdocdir}/%{name}-%{version}" \
+	DOC_DIR="%{_docdir}/%{name}-%{version}" \
 	INSTALL_MANPATH='$(DESTDIR)%{_mandir}' \
 	DATA_DIR='$(DESTDIR)/var/lib/linpopup' \
 	CFLAGS="%{rpmcflags} " \
@@ -49,14 +51,18 @@ cd src
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/linpopup}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_datadir}/linpopup} \
+	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
-(cd src; make install \
-	DESTDIR="$RPM_BUILD_ROOT" \
+%{__make} install -C src \
+	DESTDIR=$RPM_BUILD_ROOT \
 	PREFIX="%{_prefix}" \
 	INSTALL_MANPATH='$(DESTDIR)%{_mandir}' \
 	DATA_DIR='$(DESTDIR)/var/lib/linpopup' \
-	DOC_DIR="$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}" )
+	DOC_DIR="$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}"
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/linpopup.1
 echo ".so LinPopUp.1" >$RPM_BUILD_ROOT%{_mandir}/man1/linpopup.1
@@ -66,11 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{_defaultdocdir}/%{name}-%{version}
-
-%dir /var/lib/linpopup
-
+%doc AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/*
-%attr(666,nobody,nobody) /var/lib/linpopup/messages.dat
+%attr(666,nobody,nobody) /var/lib/linpopup/messages.dat # FIXME nobody user/group can't own files! -adapter.awk
+%{_desktopdir}/*.desktop
+%{_pixmapsdir}/*
 %{_mandir}/man1/*
 %{_datadir}/LinPopUp
+%dir /var/lib/linpopup