/[packages]/backports/4/cinnamon/current/SPECS/cinnamon.spec
ViewVC logotype

Diff of /backports/4/cinnamon/current/SPECS/cinnamon.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 567559 by colin, Thu Jan 23 20:43:18 2014 UTC revision 567692 by colin, Fri Jan 24 09:12:23 2014 UTC
# Line 164  sed -i -e 's@-OOt@-t@g' files%{_bindir}/ Line 164  sed -i -e 's@-OOt@-t@g' files%{_bindir}/
164  sed -i -e 's@cinnamon-applications@applications@g' src/cinnamon-app-system.c \  sed -i -e 's@cinnamon-applications@applications@g' src/cinnamon-app-system.c \
165    files/usr/share/cinnamon-menu-editor/cme/MenuEditor.py    files/usr/share/cinnamon-menu-editor/cme/MenuEditor.py
166    
 # kill upstream xsession file.  
 # If we leave this it overrides our one, preventing the run of /etc/X11/Xsession  
 # and thus the processing of /etc/X11/xinit.d/ files.  
 # See: https://bugs.mageia.org/show_bug.cgi?id=11582  
 rm -rf %{buildroot}%{_datadir}/xsessions  
   
167  %{__mkdir_p} files%{_sysconfdir}/X11/wmsession.d  %{__mkdir_p} files%{_sysconfdir}/X11/wmsession.d
168  install -pm 644 %SOURCE5 %SOURCE6 files%{_sysconfdir}/X11/wmsession.d  install -pm 644 %SOURCE5 %SOURCE6 files%{_sysconfdir}/X11/wmsession.d
169    
# Line 197  export CFLAGS="$RPM_OPT_FLAGS -Wno-error Line 191  export CFLAGS="$RPM_OPT_FLAGS -Wno-error
191  # Remove .la file  # Remove .la file
192  rm -rf %{buildroot}/%{_libdir}/cinnamon/libcinnamon.la  rm -rf %{buildroot}/%{_libdir}/cinnamon/libcinnamon.la
193    
   
194  install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas/cinnamon-mageia.gschema.override  install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas/cinnamon-mageia.gschema.override
195    
196  # install polkik autostart desktop file  # install polkik autostart desktop file
# Line 219  desktop-file-install Line 212  desktop-file-install
212  # fix hard coded path  # fix hard coded path
213  %ifarch x86_64  %ifarch x86_64
214  sed -i -e 's@/usr/lib/cinnamon-control-center@/usr/lib64/cinnamon-control-center@g' \  sed -i -e 's@/usr/lib/cinnamon-control-center@/usr/lib64/cinnamon-control-center@g' \
215  $RPM_BUILD_ROOT/%{_datadir}/cinnamon-settings/bin/capi.py    %{buildroot}%{_datadir}/cinnamon-settings/bin/capi.py
216  %endif  %endif
217    
218    # kill upstream xsession file.
219    # If we leave this it overrides our one, preventing the run of /etc/X11/Xsession
220    # and thus the processing of /etc/X11/xinit.d/ files.
221    # See: https://bugs.mageia.org/show_bug.cgi?id=11582
222    rm -rf %{buildroot}%{_datadir}/xsessions
223    
224  %find_lang %{name}  %find_lang %{name}
225  %files -f %{name}.lang  %files -f %{name}.lang
226  %doc COPYING README  %doc COPYING README
Legend:
Removed from v.567559  
changed lines
  Added in v.567692
  ViewVC Help
Powered by ViewVC 1.1.30