packages: jag/jag-paths.patch, jag/jag.spec - use /usr/share/games/jag dir ...

[sparky]

Author: sparky                       Date: Thu Feb  4 12:24:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use /usr/share/games/jag dir
- pass rpm*flags and __cxx

---- Files affected:
packages/jag:
   jag-paths.patch (1.1 -> 1.2) , jag.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/jag/jag-paths.patch
diff -u packages/jag/jag-paths.patch:1.1 packages/jag/jag-paths.patch:1.2
--- packages/jag/jag-paths.patch:1.1	Thu Feb  4 11:36:00 2010
+++ packages/jag/jag-paths.patch	Thu Feb  4 13:24:34 2010
@@ -19,7 +19,7 @@
 +    target.path = /usr/bin/
      INSTALLS += target
 -    datas.path = /usr/local/games/jag
-+    datas.path = /usr/share/jag
++    datas.path = /usr/share/games/jag
      datas.files = data
      INSTALLS += datas
      LIBS += -lXrandr
@@ -30,7 +30,7 @@
  #ifdef Q_WS_X11
    if (!QDir(resourcePath).exists())
 -    resourcePath = "/usr/local/games/jag/data/";
-+    resourcePath = "/usr/share/jag/data/";
++    resourcePath = "/usr/share/games/jag/data/";
  #endif
  
    langPath = resourcePath + "lang/";

================================================================
Index: packages/jag/jag.spec
diff -u packages/jag/jag.spec:1.4 packages/jag/jag.spec:1.5
--- packages/jag/jag.spec:1.4	Thu Feb  4 13:12:11 2010
+++ packages/jag/jag.spec	Thu Feb  4 13:24:34 2010
@@ -44,8 +44,10 @@
 
 %build
 qmake-qt4
-%{__sed} -i 's,local/games,share,g;s,local/,,g' Makefile
-%{__make}
+%{__make} \
+	CXX="%{__cxx}" \
+	CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \
+	LFLAGS="%{rpmcxxflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,7 +62,7 @@
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_bindir}/jag
-%{_datadir}/%{name}
+%{_datadir}/games/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -68,6 +70,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/02/04 12:24:34  sparky
+- use /usr/share/games/jag dir
+- pass rpm*flags and __cxx
+
 Revision 1.4  2010/02/04 12:12:11  sparky
 - direct source link is available, use it
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jag/jag-paths.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jag/jag.spec?r1=1.4&r2=1.5&f=u